rel-eng/packages/spacewalk-utils | 2 +-
utils/apply_errata | 4 ++--
utils/spacewalk-utils.spec | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit bff6a145f18e00f3305307d78f73d661bcc9b8fe
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Apr 24 11:31:50 2012 -0400
Automatic commit of package [spacewalk-utils] release [1.8.10-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index ec0afc2..6a01408 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.8.9-1 utils/
+1.8.10-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index d8a54d8..38570ef 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.8.9
+Version: 1.8.10
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -87,6 +87,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Tue Apr 24 2012 Stephen Herr <sherr(a)redhat.com> 1.8.10-1
+- 812810 - Better regex for getting system_id in apply_errata
+
* Mon Apr 23 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.9-1
- 812886 - determine the advisory type by parsing "advisory_type"
commit 8563013e13a6b6166bce4bc6c9e130b5c9d95ba2
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Apr 24 11:30:44 2012 -0400
812810 - Better regex for getting system_id in apply_errata
diff --git a/utils/apply_errata b/utils/apply_errata
index da485b3..8e38fc6 100755
--- a/utils/apply_errata
+++ b/utils/apply_errata
@@ -87,14 +87,14 @@ def testEnvVar(ev):
def getSysId():
infile = open("/etc/sysconfig/rhn/systemid","r")
text = infile.read()
- pattern = re.compile("[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]")
+ pattern = re.compile(">ID-([0-9]{10})<")
result = pattern.search(text)
infile.close()
if result is None:
print "No system ID found, please register the node with RHN or your local
Satellite/"
print "Spacewalk server using rhn_register or another appropriate tool"
sys.exit(3)
- return int(result.group(0))
+ return int(result.group(1))
def getServer():
Show replies by date