client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 24 ++++++++--
1 file changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 33666946cb441e646bdca76ab18b05e8b4ab73f3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 29 11:40:06 2011 +0100
define __init__, __getattribute__, __setattr__ on Debian and workaround those mising methods on RHEL5
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 97d9ac3..989e876 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -17,8 +17,13 @@ from platform import getPlatform
if getPlatform() == 'deb':
RepoError = Error
- class YumBaseError:
- pass
+ class YumBaseError(Exception):
+ def __init__(self, errmsg):
+ self.value = errmsg
+ def __getattribute__(self, name):
+ raise AttributeError(_("class %s has no attribute '%s'") % (self.__class__.__name__, name))
+ def __setattr__(self, name, value):
+ raise AttributeError(_("class %s has no attribute '%s'") % (self.__class__.__name__, name))
else:
from yum.Errors import RepoError, YumBaseError
@@ -41,14 +46,25 @@ class Error(YumBaseError):
if name == 'errmsg':
return self.value
else:
- return YumBaseError.__getattribute__(self, name)
+ if hasattr(YumBaseError, '__getattribute__'):
+ # rhel5 has no __getattribute__()
+ return YumBaseError.__getattribute__(self, name)
+ else:
+ if name in self.__dict__:
+ return self.__dict__[name]
+ else:
+ raise AttributeError(_("class %s has no attribute '%s'") % (self.__class__.__name__, name))
def __setattr__(self, name, value):
""" Spacewalk backend still use errmsg, let have errmsg as alias to value """
if name == 'errmsg':
self.__dict__['value'] = value
else:
- YumBaseError.__setattr__(self, name, value)
+ if hasattr(YumBaseError, '__setattr__'):
+ # rhel5 has no __setattr__()
+ YumBaseError.__setattr__(self, name, value)
+ else:
+ self.__dict__[name] = value
class RpmError(Error):
"""rpm itself raised an error condition"""
12 years, 5 months
Changes to 'refs/tags/spacewalk-backend-1.6.46-1'
by Michael Mraka
Tag 'spacewalk-backend-1.6.46-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-11-29 10:09 +0000
Tagging package [spacewalk-backend] version [1.6.46-1] in directory [backend/].
Changes since rhnpush-5.5.35-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-backend] release [1.6.46-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 5 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7133d4c447444058fe59e098a5333696a9fe8a32
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Nov 29 11:09:54 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.6.46-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 73680fb..97f1bd2 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.45
+Version: 1.6.46
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -675,6 +675,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Nov 29 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.46-1
+- removed dead function
+
* Mon Nov 28 2011 Miroslav Suchý 1.6.45-1
- fix typos in boolean variables (mc(a)suse.de)
- add missing import (mc(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a842816..b9012cf 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.45-1 backend/
+1.6.46-1 backend/
12 years, 5 months
Changes to 'refs/tags/rhnpush-5.5.35-1'
by Michael Mraka
Tag 'rhnpush-5.5.35-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-11-29 10:09 +0000
Tagging package [rhnpush] version [5.5.35-1] in directory [client/tools/rhnpush/].
Changes since SputLite-1.6.3-1:
Michael Mraka (4):
removed dead function
removed dead function
removed dead function
Automatic commit of package [rhnpush] release [5.5.35-1].
---
backend/server/rhnCapability.py | 22 --------------------
backend/server/test/unit-test/test_capabilities.py | 7 ------
client/tools/rhnpush/rhnpush.spec | 5 +++-
client/tools/rhnpush/solaris2mpm.py | 23 ---------------------
client/tools/rhnpush/uploadLib.py | 3 --
rel-eng/packages/rhnpush | 2 -
6 files changed, 5 insertions(+), 57 deletions(-)
---
12 years, 5 months
client/tools rel-eng/packages
by Michael Mraka
client/tools/rhnpush/rhnpush.spec | 5 ++++-
rel-eng/packages/rhnpush | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6a85d3a359d8ac55ab619e97a2bb9a1da867ab22
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Nov 29 11:09:33 2011 +0100
Automatic commit of package [rhnpush] release [5.5.35-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index e56af96..d05e7de 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -4,7 +4,7 @@ Name: rhnpush
Group: Applications/System
License: GPLv2
URL: http://fedorahosted.org/spacewalk
-Version: 5.5.34
+Version: 5.5.35
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/solaris2mpm.8*
%changelog
+* Tue Nov 29 2011 Michael Mraka <michael.mraka(a)redhat.com> 5.5.35-1
+- removed dead functions
+
* Thu Nov 24 2011 Michael Mraka <michael.mraka(a)redhat.com> 5.5.34-1
- replaced external zip with zipfile module
- replaced external tar with tarfile module
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index 3c15fb0..946a040 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.5.34-1 client/tools/rhnpush/
+5.5.35-1 client/tools/rhnpush/
12 years, 5 months
3 commits - backend/server client/tools
by Michael Mraka
backend/server/rhnCapability.py | 22 --------------------
backend/server/test/unit-test/test_capabilities.py | 7 ------
client/tools/rhnpush/solaris2mpm.py | 23 ---------------------
client/tools/rhnpush/uploadLib.py | 3 --
4 files changed, 55 deletions(-)
New commits:
commit ece5c1865d498c05ef878f53bdc12ce15d0e00c2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 28 11:29:11 2011 +0100
removed dead function
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index 15c255b..0ac6d4a 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -645,9 +645,6 @@ def call(function, *params):
return ret
-def raw_call(function, *params):
- return function(*params)
-
def parseXMLRPCfault(fault):
if not isinstance(fault, xmlrpclib.Fault):
commit 8fcf1d3c6311d32e05b517f8f5a650140272e6b0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 28 11:29:11 2011 +0100
removed dead function
diff --git a/backend/server/rhnCapability.py b/backend/server/rhnCapability.py
index 5ac0fc6..134477c 100644
--- a/backend/server/rhnCapability.py
+++ b/backend/server/rhnCapability.py
@@ -54,28 +54,6 @@ def set_client_capabilities(capabilities):
def get_client_capabilities():
return rhnFlags.get('client-capabilities')
-def get_db_client_capabilities(server_id):
- h = rhnSQL.prepare("""
- select cc.capability_name_id, ccn.name capability, cc.version
- from rhnClientCapability cc, rhnClientCapabilityName ccn
- where cc.server_id = :server_id
- and cc.capability_name_id = ccn.id
- """)
- h.execute(server_id=server_id)
- ret = {}
- while 1:
- row = h.fetchone_dict()
- if not row:
- break
- name = row['capability']
- version = row['version']
- value = None
- ret[name] = {
- 'version' : version,
- 'value' : value,
- }
- return ret
-
def update_client_capabilities(server_id):
caps = get_client_capabilities()
diff --git a/backend/server/test/unit-test/test_capabilities.py b/backend/server/test/unit-test/test_capabilities.py
index 02ab8eb..c2ee8af 100644
--- a/backend/server/test/unit-test/test_capabilities.py
+++ b/backend/server/test/unit-test/test_capabilities.py
@@ -89,13 +89,6 @@ def main():
server_id = sobj.getid()
print "Registered server", server_id
- caps = rhnCapability.get_db_client_capabilities(server_id)
- caps_len = len(caps.keys())
- expected_len = len(str_caps)
- if caps_len != expected_len:
- print "FAILED: return %d caps, expected %d" % (caps_len, expected_len)
- return 1
- print "Succeeded", caps
return 0
if __name__ == '__main__':
commit e935bd26fdce1c86579bb438ae7f01bff626d9b7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 28 14:17:55 2011 +0100
removed dead function
diff --git a/client/tools/rhnpush/solaris2mpm.py b/client/tools/rhnpush/solaris2mpm.py
index 97086ab..4212d9b 100644
--- a/client/tools/rhnpush/solaris2mpm.py
+++ b/client/tools/rhnpush/solaris2mpm.py
@@ -881,29 +881,6 @@ def _unique_list_of_dicts(list_):
return list_
-def unique_patches(dict1, dict2, key):
- """traverse lists of patches in 2 dictionaries, and remove and duplicates
- from the list in dict2"""
- # NOTE this is something of a kludge, and a bug that came up after the main
- # implementation because a patch can patch multiple packages and each
- # pkginfo file for each package can list the same requires, conflicts,
- # obsoletes patches, potentially adding the same patch(es) to these lists
- # multiple times
-
- removals = []
-
- # simple mxn algorithm, these lists shouldn't be more than a couple of
- # elements in length
- for p1 in dict1[key]:
- for p2 in dict2[key]:
- if p1['name'] == p2['name'] and p1['version'] == p2['version']:
- removals.append(p2)
-
- for r in removals:
- dict2[key].remove(r)
-
- return dict2[key]
-
# write mpm files --------------------------------------------------------
def write_mpm(mpm):
12 years, 5 months
Changes to 'refs/tags/SputLite-1.6.3-1'
by Jan Pazdziora
Tag 'SputLite-1.6.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-11-29 07:25 +0000
Tagging package [SputLite] version [1.6.3-1] in directory [monitoring/SputLite/].
Changes since spacewalk-backend-1.6.45-1:
Jan Pazdziora (3):
Revert "postgres seems to reject empty text for stdout and stderr column"
Correct fix for the vn_rhn_command_queue_execs_stderr constraint issue.
Automatic commit of package [SputLite] release [1.6.3-1].
---
monitoring/SputLite/SputLite.spec | 6 +++++-
monitoring/SputLite/html/cgi-bin/upload_results.cgi | 2 +-
rel-eng/packages/SputLite | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
12 years, 5 months
3 commits - monitoring/SputLite rel-eng/packages
by Jan Pazdziora
monitoring/SputLite/SputLite.spec | 6 +++++-
monitoring/SputLite/html/cgi-bin/upload_results.cgi | 2 +-
rel-eng/packages/SputLite | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit b98f22686b374c65750343f6aec9e8a9ab292bcc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Nov 29 08:25:36 2011 +0100
Automatic commit of package [SputLite] release [1.6.3-1].
diff --git a/monitoring/SputLite/SputLite.spec b/monitoring/SputLite/SputLite.spec
index 00445f9..69af4d5 100644
--- a/monitoring/SputLite/SputLite.spec
+++ b/monitoring/SputLite/SputLite.spec
@@ -5,7 +5,7 @@
%define vardir /var/lib/nocpulse
Name: SputLite
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.6.2
+Version: 1.6.3
Release: 1%{?dist}
Summary: Command queue processor (Sputnik Lite)
URL: https://fedorahosted.org/spacewalk
@@ -98,6 +98,10 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Nov 29 2011 Jan Pazdziora 1.6.3-1
+- Correct fix for the vn_rhn_command_queue_execs_stderr constraint issue.
+- Revert "postgres seems to reject empty text for stdout and stderr column"
+
* Mon Nov 28 2011 Miroslav Suchý 1.6.2-1
- replace sysdate with current_timestamp (mc(a)suse.de)
- postgres seems to reject empty text for stdout and stderr column (mc(a)suse.de)
diff --git a/rel-eng/packages/SputLite b/rel-eng/packages/SputLite
index 07577ef..d5f857d 100644
--- a/rel-eng/packages/SputLite
+++ b/rel-eng/packages/SputLite
@@ -1 +1 @@
-1.6.2-1 monitoring/SputLite/
+1.6.3-1 monitoring/SputLite/
commit 6fe5acfe48abd7e07ef2f87da7422a6bf13dbd23
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Nov 29 08:24:51 2011 +0100
Correct fix for the vn_rhn_command_queue_execs_stderr constraint issue.
diff --git a/monitoring/SputLite/html/cgi-bin/upload_results.cgi b/monitoring/SputLite/html/cgi-bin/upload_results.cgi
index 913fa53..3939252 100755
--- a/monitoring/SputLite/html/cgi-bin/upload_results.cgi
+++ b/monitoring/SputLite/html/cgi-bin/upload_results.cgi
@@ -113,6 +113,7 @@ sub ProcessInput {
# Truncate to fit into a varchar2(4000)
$value = substr($value, 0, 3996) . '...' if (length($value) > 4000);
+ $value = under if $value eq '';
push(@values, "$field = ?");
push(@bindvars, $value);
commit a878a171f68d2a0499f1bca1dd436065ce0337bd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Nov 29 08:22:36 2011 +0100
Revert "postgres seems to reject empty text for stdout and stderr column"
This reverts commit cb03309b01f3716967de6f1981502c7b56b99ff7.
It is quite correct that PostgreSQL rejects empty strings -- it is
because Oracle quietly converts them to nulls. The purpose of
the vn_* constraints is to force the applications to be changed
properly, which means inserting nulls in the first place.
diff --git a/monitoring/SputLite/html/cgi-bin/upload_results.cgi b/monitoring/SputLite/html/cgi-bin/upload_results.cgi
index cf5794a..913fa53 100755
--- a/monitoring/SputLite/html/cgi-bin/upload_results.cgi
+++ b/monitoring/SputLite/html/cgi-bin/upload_results.cgi
@@ -113,7 +113,6 @@ sub ProcessInput {
# Truncate to fit into a varchar2(4000)
$value = substr($value, 0, 3996) . '...' if (length($value) > 4000);
- $value = ' ' if (length($value) == 0);
push(@values, "$field = ?");
push(@bindvars, $value);
12 years, 5 months
Changes to 'refs/tags/spacewalk-backend-1.6.45-1'
by Miroslav Suchý
Tag 'spacewalk-backend-1.6.45-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-11-28 17:08 +0000
Tagging package [spacewalk-backend] version [1.6.45-1] in directory [backend/].
Changes since osad-5.10.27-1:
Miroslav Suchý (1):
Automatic commit of package [spacewalk-backend] release [1.6.45-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 5 months
Changes to 'refs/tags/osad-5.10.27-1'
by Miroslav Suchý
Tag 'osad-5.10.27-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-11-28 17:08 +0000
Tagging package [osad] version [5.10.27-1] in directory [client/tools/osad/].
Changes since SputLite-1.6.2-1:
Miroslav Suchý (1):
Automatic commit of package [osad] release [5.10.27-1].
---
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 5 months