[python-meh][master/f22-branch/rhel7-branch][PATCH] Make sure the date in RPM changelog is always in English
by Martin Kolman
Make sure that the date in the RPM changelog is always in English
regardless of system locale as various RPM tools don't really handle
localized dates.
Signed-off-by: Martin Kolman <mkolman(a)redhat.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index cb5675e..910d850 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ bumpver: potfile
zanata push $(ZANATA_PUSH_ARGS) || ( echo "zanata push failed"; exit 1 )
@NEWSUBVER=$$((`echo $(VERSION) |cut -d . -f 2` + 1)) ; \
NEWVERSION=`echo $(VERSION).$$NEWSUBVER |cut -d . -f 1,3` ; \
- DATELINE="* `date "+%a %b %d %Y"` `git config user.name` <`git config user.email`> - $$NEWVERSION-1" ; \
+ DATELINE="* `LANG=c date "+%a %b %d %Y"` `git config user.name` <`git config user.email`> - $$NEWVERSION-1" ; \
cl=`grep -n %changelog python-meh.spec |cut -d : -f 1` ; \
tail --lines=+$$(($$cl + 1)) python-meh.spec > speclog ; \
(head -n $$cl python-meh.spec ; echo "$$DATELINE" ; make --quiet rpmlog 2>/dev/null ; echo ""; cat speclog) > python-meh.spec.new ; \
--
2.3.5
9 years
New: [rhinstaller/anaconda/pulls/74 f22-branch] Fix issues with disk selection changes (#1166598)
by dashea
**Please ignore the first two commits, those have already been ACKed on the mailing list and just were not pushed to f22-branch yet (I'm waiting for Beta to be declared GO)**
The first of the latter four commits make the ``on_back_clicked`` method of the *StorageSpoke* less complicated because it has been bloating with if's and duplicated chunks of code for quite some time into the shape that was really hard to understand not even modify. To review this commit I highly recommend to check the result instead of/before going through the changes. The second commit is just a minor change simplifying the logic a bit.
The last two commits implement and use a snapshot of on-disk storage as we get it from scanning disks before we do any modifications so that we can revert everything to it in case user changes their mind about disk selection. The previous "limbo" with hiding/unhiding disks and relying on the result of cancelling actions on the way being the original state of everything was brave, but not working. However, it still is the right thing to do and that's why this PR is only for the f22-branch with quite a bit of hope that action cancelling will have been fixed in blivet by the time of F23.
--
To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/74
9 years
[Patch for Review] iSCSI Name Validation using regex.
by Sujith Pandel
Hi All,
The following patch is to make use of a regular expression to validate the user given iSCSI Initiator name in Anaconda, while selecting iSCSI disks during OS installation.
I have tested it for cases which I could think of at this time.
Requesting review/feedback and inclusion.
Thanks and Regards,
Sujith Pandel
When adding iSCSI target disk during installation, the iSCSI Initiator name and the Target IP is validated to enable/disable the "Start Discovery" button on the page.
Currently, the validation of iSCSI Initiator Name is based on the existence of dots only (".") and this can be more efficiently done by using a regular expression.
The conditions for iSCSI initiator name used in this regex are
(https://tools.ietf.org/html/rfc3720#section-3.2.6.3.1 , https://tools.ietf.org/html/rfc3721#page-5 and http://standards.ieee.org/regauth/oui/tutorials/EUI64.html):
1. For iqn format:
a. Starts with string 'iqn.'
b. A date code specifying the year and month in which the organization registered the domain or sub-domain name used as the naming authority string. “yyyy-mm”
c. A dot (".")
d. The organizational naming authority string, which consists of a valid, reversed domain or subdomain name.
e. Optionally, a colon (":"), followed by a string of the assigning organization's choosing, which must make each assigned iSCSI name unique. With the exception of the colon prefix, the owner of the domain name can assign everything after the reversed domain name as desired.
2. For eui format:
The format is "eui." followed by an EUI-64 identifier (16 ASCII-encoded hexadecimal digits).
Signed-off-by: Sujith Pandel <sujithpshankar(a)gmail.com>
---
pyanaconda/regexes.py | 8 ++++++++
pyanaconda/ui/gui/spokes/advstorage/iscsi.py | 18 ++++++++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/regexes.py b/pyanaconda/regexes.py
index b4e52a3..f153915 100644
--- a/pyanaconda/regexes.py
+++ b/pyanaconda/regexes.py
@@ -135,3 +135,11 @@ REPO_NAME_VALID = re.compile(r'^[a-zA-Z0-9_.:-]+$')
# Product Version string, just the starting numbers like 21 or 21.1
VERSION_DIGITS = r'([\d.]+)'
+
+
+#iSCSI Naming Standards: RFC 3720 and RFC 3721
+ISCSI_IQN_NAMING_FORMAT = re.compile(r'^iqn\.\d{4}-\d{2}((?<!-)\.(?!-)[a-zA-Z0-9\-]+){1,63}(?<!-)(?<!\.)(:[^:]+)?')
+
+ISCSI_EUI_NAMING_FORMAT = re.compile(r'^eui\.[a-fA-F0-9]{16}')
+
+
diff --git a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
index 22e11c3..764e81f 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
+++ b/pyanaconda/ui/gui/spokes/advstorage/iscsi.py
@@ -18,7 +18,7 @@
#
# Red Hat Author(s): Chris Lumens <clumens(a)redhat.com>
#
-
+import re
from IPy import IP
from collections import namedtuple
from gi.repository import GLib
@@ -29,6 +29,9 @@ from pyanaconda.ui.gui import GUIObject
from pyanaconda.ui.gui.utils import escape_markup
from pyanaconda.i18n import _
from pyanaconda import nm
+from pyanaconda.regexes import ISCSI_IQN_NAMING_FORMAT
+from pyanaconda.regexes import ISCSI_EUI_NAMING_FORMAT
+
__all__ = ["ISCSIDialog"]
@@ -303,7 +306,18 @@ class ISCSIDialog(GUIObject):
stripped = text.strip()
#iSCSI Naming Standards: RFC 3720 and RFC 3721
- return "." in stripped
+ if stripped.startswith('iqn.'):
+ initiator_name_match = re.match(ISCSI_IQN_NAMING_FORMAT,stripped)
+ elif stripped.startswith('eui.'):
+ initiator_name_match = re.match(ISCSI_EUI_NAMING_FORMAT,stripped)
+ else:
+ return False
+
+ if initiator_name_match and (len(initiator_name_match.group(0)) == len(stripped)):
+ return True
+ else:
+ return False
+
def on_discover_field_changed(self, *args):
# Make up a credentials object so we can test if it's valid.
--
2.1.0
9 years
New: [rhinstaller/anaconda/pulls/75 master] Add support for chrony pool directive
by dashea
With chrony-2.0 it is possible to specify a pool of NTP servers instead
of individual servers. It selects four servers from the addresses that
the pool name is resolved to and replaces them automatically when they
are unreachable or falsetickers. This is now used in the default Fedora
chrony configuration.
To avoid extending the ntp API and the date time spoke, pools are simply
presented as four separate servers with the same name.
Resolves: rhbz#1193389
--
To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/75
9 years
New: [rhinstaller/anaconda/pulls/86 master] Master docs
by dashea
I've been trying to figure out how to create good docs for pyanaconda using Read the Docs, and have hit a dead end. RTD depends on the autodoc feature in Sphinx, but can't install anything other than python projects with a setup.py. You can mock various objects like I did in the previous pass at this, but that's fragile and still doesn't result in complete docs.
So, I propose that we generate the docs on a system with all the build deps installed or available via repos so that they are complete and nice looking, and that we carry the html output in the repo. This allows us to either server it up ourselves from someplace, or use gh-pages to serve it from github (which is what I suggest).
My understanding is you create a gh-pages branch for the project, then copy the html into the root of that branch (so it really isn't a branch, just a place to store the html for github). I'd suggest doing this manually so that the output can be checked for import problems.
--
To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/86
9 years
[initial-setup][master/f22-branch][PATCH 0/2] Makefile cleanup and improvements
by Martin Kolman
The first patch removes some obsolete stuff from the Initial Setup Makefile,
the second patch improves the Makefile with code mostly based on what the
python-meh Makefile does.
Martin Kolman (2):
Remove old GUI testing code from the Makefile
Improve the Makefile
Makefile | 115 +++++++++++++++++++++++++++++------------------------
initial-setup.spec | 15 ++++---
po/Makefile | 2 +-
3 files changed, 73 insertions(+), 59 deletions(-)
--
2.3.5
9 years