client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhnlib/rhnlib.spec | 5 ++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 367fedf3fe7c7353920ce7f553a8e4816bfa81e0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 27 17:08:03 2012 +0100
Automatic commit of package [rhnlib] release [2.5.51-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index 11dcbc5..9e64ce3 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.50
+Version: 2.5.51
Release: 1%{?dist}
Group: Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Fri Jan 27 2012 Jan Pazdziora 2.5.51-1
+- Revert "make split_host IPv6 compliant" (msuchy(a)redhat.com)
+
* Wed Jan 11 2012 Miroslav Suchý 2.5.50-1
- make split_host IPv6 compliant
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index 5bba324..857ca88 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.50-1 client/rhel/rhnlib/
+2.5.51-1 client/rhel/rhnlib/
12 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.7.11-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.7.11-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-01-27 16:06 +0000
Tagging package [spacewalk-java] version [1.7.11-1] in directory [java/].
Changes since NPalert-1.126.29-1:
Jan Pazdziora (2):
784013 - casting the probe id to string since that is what the substr expression in the DELETE returns.
Automatic commit of package [spacewalk-java] release [1.7.11-1].
---
java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java | 2 +-
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
---
12 years, 3 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 019c741f3d6acbe04e644ac300f9d7fbed2b4697
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 27 17:06:19 2012 +0100
Automatic commit of package [spacewalk-java] release [1.7.11-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5238f42..542dd41 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.7.10
+Version: 1.7.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -555,6 +555,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jan 27 2012 Jan Pazdziora 1.7.11-1
+- 784013 - casting the probe id to string since that is what the substr
+ expression in the DELETE returns.
+- unify virtual guest defaults used in API and WebUI (tlestach(a)redhat.com)
+- 703273 - save information messages only if having messages to display
+ (tlestach(a)redhat.com)
+
* Wed Jan 25 2012 Tomas Lestach <tlestach(a)redhat.com> 1.7.10-1
- 749476 - return default (empty) string instead of omitting the attribute for
channel.software.getDetails API (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 79b3df8..96dfd52 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.7.10-1 java/
+1.7.11-1 java/
12 years, 3 months
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4dc19730824ded78827a0b9ae39bba25c6bee453
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 27 17:04:56 2012 +0100
784013 - casting the probe id to string since that is what the substr expression in the DELETE returns.
If we ever get to refactor that time_series table and use proper integer
column, this will need to be reverted.
diff --git a/java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java b/java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java
index df61608..146c0cf 100644
--- a/java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/monitoring/MonitoringFactory.java
@@ -73,7 +73,7 @@ public class MonitoringFactory extends HibernateFactory {
WriteMode m = ModeFactory.getWriteMode("Monitoring_queries",
"delete_time_series_for_probe");
Map params = new HashMap();
- params.put("probe_id", probeIn.getId());
+ params.put("probe_id", probeIn.getId().toString());
m.executeUpdate(params);
singleton.removeObject(probeIn);
12 years, 3 months
Changes to 'refs/tags/NPalert-1.126.29-1'
by Jan Pazdziora
Tag 'NPalert-1.126.29-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-01-27 15:47 +0000
Tagging package [NPalert] version [1.126.29-1] in directory [monitoring/NPalert/].
Changes since rhn-client-tools-1.7.8-1:
Jan Pazdziora (2):
730305 - Upon start, wait for generate-config to generate the config.
Automatic commit of package [NPalert] release [1.126.29-1].
---
monitoring/NPalert/NPalert.spec | 5 ++++-
monitoring/NPalert/NotifIniInterface.pm | 5 +++++
monitoring/NPalert/scripts/notif-launcher | 5 +++++
rel-eng/packages/NPalert | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
---
12 years, 3 months
monitoring/NPalert rel-eng/packages
by Jan Pazdziora
monitoring/NPalert/NPalert.spec | 5 ++++-
rel-eng/packages/NPalert | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2324634f6362360e1fbe35fd72df751f90cd6b1e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 27 16:47:03 2012 +0100
Automatic commit of package [NPalert] release [1.126.29-1].
diff --git a/monitoring/NPalert/NPalert.spec b/monitoring/NPalert/NPalert.spec
index 26834db..9d81544 100644
--- a/monitoring/NPalert/NPalert.spec
+++ b/monitoring/NPalert/NPalert.spec
@@ -9,7 +9,7 @@ Name: NPalert
Summary: NOCpulse notification system
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.126.28
+Version: 1.126.29
Release: 1%{?dist}
BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -137,6 +137,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jan 27 2012 Jan Pazdziora 1.126.29-1
+- 730305 - Upon start, wait for generate-config to generate the config.
+
* Tue Jan 24 2012 Jan Pazdziora 1.126.28-1
- When we rollback before going to sleep, we won't keep transaction active.
diff --git a/rel-eng/packages/NPalert b/rel-eng/packages/NPalert
index cd05a7d..e8a0818 100644
--- a/rel-eng/packages/NPalert
+++ b/rel-eng/packages/NPalert
@@ -1 +1 @@
-1.126.28-1 monitoring/NPalert/
+1.126.29-1 monitoring/NPalert/
12 years, 3 months
monitoring/NPalert
by Jan Pazdziora
monitoring/NPalert/NotifIniInterface.pm | 5 +++++
monitoring/NPalert/scripts/notif-launcher | 5 +++++
2 files changed, 10 insertions(+)
New commits:
commit b55cb176e84c519a9dcd2f68f7e75521205f98d7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 27 16:43:47 2012 +0100
730305 - Upon start, wait for generate-config to generate the config.
Addressing
2012-01-24 12:10:53 no file /etc/notification/generated/customers.ini No such file or directory at /usr/share/perl5/vendor_perl/NOCpulse/Notif/NotificationIni.pm line 86.
diff --git a/monitoring/NPalert/NotifIniInterface.pm b/monitoring/NPalert/NotifIniInterface.pm
index 063bd90..85fd7e3 100644
--- a/monitoring/NPalert/NotifIniInterface.pm
+++ b/monitoring/NPalert/NotifIniInterface.pm
@@ -200,6 +200,11 @@ sub buildContactGroups {
} # End of buildContactGroups
+sub checkCustomersExist {
+ my $self = shift;
+ return (-f ($self->config_dir . "/customers.ini"));
+}
+
####################
sub buildCustomers {
####################
diff --git a/monitoring/NPalert/scripts/notif-launcher b/monitoring/NPalert/scripts/notif-launcher
index ec77dd3..b08f31a 100755
--- a/monitoring/NPalert/scripts/notif-launcher
+++ b/monitoring/NPalert/scripts/notif-launcher
@@ -65,6 +65,11 @@ my $SOCKET_FILENAME="$TMPDIR/escsock"; ## TBD -- replace with config file entr
use vars qw ( $lastcfgcheck $CUSTOMERS $FORMATS $SCHEDULES
$METHODS $GROUPS $REDIRECTS);
+my $interface=new NOCpulse::Notif::NotifIniInterface;
+while (not $interface->checkCustomersExist()) {
+ $Log->log(1, "Customers not yet generated by generate-config, sleeping for a while.\n");
+ sleep 5;
+}
&loadConfig();
12 years, 3 months
Changes to 'refs/tags/rhn-client-tools-1.7.8-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.7.8-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-01-27 15:16 +0000
Tagging package [rhn-client-tools] version [1.7.8-1] in directory [client/rhel/rhn-client-tools/].
Changes since nocpulse-common-2.2.2-1:
Miroslav Suchý (2):
729342 - fix another TB with errmsg instance
Automatic commit of package [rhn-client-tools] release [1.7.8-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 4 +++-
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
12 years, 3 months
2 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 4 +++-
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 5011b826bc87933cecbbb9fb6235282ab121f593
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jan 27 16:16:37 2012 +0100
Automatic commit of package [rhn-client-tools] release [1.7.8-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 31578eb..5c78c2e 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.7.7
+Version: 1.7.8
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -334,6 +334,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Fri Jan 27 2012 Miroslav Suchý 1.7.8-1
+- 729342 - fix another TB with errmsg instance
+
* Wed Jan 18 2012 Miroslav Suchý 1.7.7-1
- 781421 - newt can not accept unicode
- 781421 - sys.stderr.write could not handle decoded unicode
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 7055c11..e04e501 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.7.7-1 client/rhel/rhn-client-tools/
+1.7.8-1 client/rhel/rhn-client-tools/
commit 9b28ded9de35b00d05457c877b8e8bb9d68a37de
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jan 27 16:15:48 2012 +0100
729342 - fix another TB with errmsg instance
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 2a3f054..2ec4759 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -185,7 +185,7 @@ class NetworkError(Error):
""" some generic network error occured, e.g. connection reset by peer """
premsg = _("Network error: ")
-class SSLCertificateVerifyFailedError(RepoError):
+class SSLCertificateVerifyFailedError(RepoError, Error):
def __init__(self):
# Need to override __init__ because the base class requires a message arg
# and this exception shouldn't.
@@ -201,6 +201,8 @@ class SSLCertificateVerifyFailedError(RepoError):
else:
RepoError.__init__(self, "The SSL certificate failed verification.")
+ __getattr__ = Error.__getattr__
+
class SSLCertificateFileNotFound(Error):
pass
12 years, 3 months
Branch 'errata-date' - utils/depsolver.py
by Pradeep Kilambi
utils/depsolver.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 990ebf0c9c3595c3a366bf796473d60046c9cd36
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Fri Jan 27 10:08:11 2012 -0500
adding regex match to include file based deps
diff --git a/utils/depsolver.py b/utils/depsolver.py
index cfb78ec..04c6bac 100644
--- a/utils/depsolver.py
+++ b/utils/depsolver.py
@@ -18,6 +18,7 @@
# in this software or its documentation
import logging
+import re
import shutil
import sys
import yum
@@ -109,6 +110,7 @@ class DepSolver:
def __locateDeps(self, pkgs):
results = {}
+ regex_filename_match = re.compile('[/*?]|\[[^]]*/[^]]*\]').match
for pkg in pkgs:
results[pkg] = {}
reqs = pkg.requires
@@ -122,7 +124,8 @@ class DepSolver:
for po in self.__whatProvides(r, f, v):
# verify this po indeed provides the dep,
# el5 version could give some false positives
- if po.checkPrco('provides', (r, f, v)):
+ if regex_filename_match(r) or \
+ po.checkPrco('provides', (r, f, v)):
satisfiers.append(po)
pkgresults[req] = satisfiers
return results
12 years, 3 months