Changes to 'refs/tags/spacewalk-backend-1.1.11-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.1.11-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-05-03 10:07 +0000
Tagging package [spacewalk-backend] version [1.1.11-1] in directory [backend/].
Changes since spacewalk-backend-1.1.10-1:
Jan Pazdziora (2):
585233 - the has-comps attribute will no longer be used by hosted.
Automatic commit of package [spacewalk-backend] release [1.1.11-1].
Joshua Roys (1):
Add new rhncfg-client verify --only option to manpage
Lukáš Ďurfina (1):
add dependency information for DEB packages
Partha Aji (6):
Fixed a checkstyle error
Got the tree filters working
Added code to get checkbox grouping to work
Quick fix to deal with a null pointer that would ve occued on a logdebg
Needed to add more JS magic to get selections to work
Got the selectall checkbox working..
Simon Lukasik (1):
Removing server from cmd-line
---
backend/satellite_tools/xmlSource.py | 4
backend/server/importlib/debPackage.py | 20 +-
backend/spacewalk-backend.spec | 6
backend/spacewalk/common/rhn_deb.py | 18 +
client/rhel/rhnlib/test/23-digest-auth.py | 3
client/tools/rhncfg/config_client/rhncfg-client.8 | 9
client/tools/rhncfg/config_client/rhncfg-client.sgml | 4
java/code/src/com/redhat/rhn/frontend/taglibs/list/DataSetManipulator.java | 2
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListFilterHelper.java | 4
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 17 +
java/code/src/com/redhat/rhn/frontend/taglibs/list/SelectableColumnTag.java | 95 ++++++++--
java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java | 4
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 5
rel-eng/packages/spacewalk-backend | 2
web/html/javascript/check_all.js | 68 +++++--
15 files changed, 209 insertions(+), 52 deletions(-)
---
13 years, 12 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 7873e9ba7a3386232e6846fb8967c7e6752a80c9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 3 12:07:58 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.1.11-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index fe09cec..525ee1d 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.1.10
+Version: 1.1.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -632,6 +632,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon May 03 2010 Jan Pazdziora 1.1.11-1
+- 585233 - the has-comps attribute will no longer be used by hosted.
+- add dependency information for DEB packages (lukas.durfina(a)gmail.com)
+
* Fri Apr 30 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.10-1
- Support for uploading deb packages (lukas.durfina(a)gmail.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index e3c9b5e..1022d56 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.1.10-1 backend/
+1.1.11-1 backend/
13 years, 12 months
backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/xmlSource.py | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit 2948a21648d2c78bc204bd4be8f1da02c8532f38
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 3 12:07:24 2010 +0200
585233 - the has-comps attribute will no longer be used by hosted.
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 1da46f2..13ae0ad 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -464,15 +464,11 @@ class ChannelItem(BaseItem):
'rhn-channel-receiving-updates' : 'receiving_updates',
'rhn-channel-checksum-type' : 'checksum_type',
'rhn-channel-comps-last-modified' : 'comps_last_modified',
- 'has-comps' : 'has_comps',
}
def populateFromElements(self, obj, elements):
BaseItem.populateFromElements(self, obj, elements)
if obj['checksum_type'] == 'sha':
obj['checksum_type'] = 'sha1'
- if (not obj.has_key('comps_last_modified') or obj['comps_last_modified'] == None) \
- and (obj.has_key('has_comps') and obj['has_comps'] == 'True'):
- obj['comps_last_modified'] = obj['last_modified']
addItem(ChannelItem)
class BaseChecksummedItem(BaseItem):
13 years, 12 months
backend/server backend/spacewalk
by Miroslav Suchý
backend/server/importlib/debPackage.py | 20 ++++++++++++++++----
backend/spacewalk/common/rhn_deb.py | 18 +++++++++++++++---
2 files changed, 31 insertions(+), 7 deletions(-)
New commits:
commit 7bd77c392ab2037348b0f558758c8f8ebe956ca4
Author: Lukáš Ďurfina <lukas.durfina(a)gmail.com>
Date: Sat May 1 20:22:36 2010 +0200
add dependency information for DEB packages
diff --git a/backend/server/importlib/debPackage.py b/backend/server/importlib/debPackage.py
index ed22ca7..7417e95 100644
--- a/backend/server/importlib/debPackage.py
+++ b/backend/server/importlib/debPackage.py
@@ -128,10 +128,22 @@ class debBinaryPackage(headerSource.rpmBinaryPackage):
}
for k, dclass in mapping.items():
l = []
- #for dinfo in header.get(k, []):
- # finst = dclass()
- # finst.populate(dinfo)
- # l.append(finst)
+ values = header[k]
+ if values != None:
+ val = string.join(values.split(), "") # remove whitespaces
+ val = val.split(',') # split packages
+ for v in val:
+ nv = v.split('(')
+ name = nv[0]
+ # TODO FIX VERSION AND FLAGS
+ if (len(nv) > 1):
+ version = nv[1].rstrip(')')
+ else:
+ version = ''
+ hash = {'name' : name, 'version' : version, 'flags' : 0}
+ finst = dclass()
+ finst.populate(hash)
+ l.append(finst)
self[k] = l
def _populateChangeLog(self, header):
diff --git a/backend/spacewalk/common/rhn_deb.py b/backend/spacewalk/common/rhn_deb.py
index b108ecb..d7728af 100644
--- a/backend/spacewalk/common/rhn_deb.py
+++ b/backend/spacewalk/common/rhn_deb.py
@@ -129,10 +129,22 @@ class deb_Header:
return self.deb.debcontrol().get_as_string('Maintainer')
elif name == 'package_group':
return self.deb.debcontrol().get_as_string('Section')
- if self.deb.debcontrol().has_key(name):
+ elif name == 'requires':
+ if self.deb.debcontrol().has_key('Depends'):
+ return self.deb.debcontrol().get_as_string('Depends')
+ elif name == 'provides':
+ if self.deb.debcontrol().has_key('Provides'):
+ return self.deb.debcontrol().get_as_string('Provides')
+ elif name == 'conflicts':
+ if self.deb.debcontrol().has_key('Conflicts'):
+ return self.deb.debcontrol().get_as_string('Conflicts')
+ elif name == 'obsoletes':
+ if self.deb.debcontrol().has_key('Replaces'):
+ return self.deb.debcontrol().get_as_string('Replaces')
+ elif self.deb.debcontrol().has_key(name):
return self.deb.debcontrol().get_as_string(name)
- else:
- return None
+
+ return None
"""
def __setitem__(self, name, item):
self.hdr[name] = item
13 years, 12 months
client/rhel
by Šimon Lukašík
client/rhel/rhnlib/test/23-digest-auth.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit ca226cb22b8aa05aab98d99daccdf34b5dbc5005
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon May 3 09:11:18 2010 +0200
Removing server from cmd-line
diff --git a/client/rhel/rhnlib/test/23-digest-auth.py b/client/rhel/rhnlib/test/23-digest-auth.py
index ad27f9a..9310191 100755
--- a/client/rhel/rhnlib/test/23-digest-auth.py
+++ b/client/rhel/rhnlib/test/23-digest-auth.py
@@ -24,8 +24,7 @@ SERVER = "longusername0123456789:longpassword0123456789@localhost"
PORT = "1234"
HANDLER = "/XMLRPC"
try:
- SERVER = sys.argv[1]
- PORT = sys.argv[2]
+ PORT = sys.argv[1]
except:
pass
13 years, 12 months
web/html
by Partha Aji
web/html/javascript/check_all.js | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit f303ce55535c7a5e74bf706307f651a54ecbdf36
Author: Partha Aji <paji(a)redhat.com>
Date: Sun May 2 16:40:58 2010 -0400
Got the selectall checkbox working..
diff --git a/web/html/javascript/check_all.js b/web/html/javascript/check_all.js
index dacdfe5..b5331b1 100644
--- a/web/html/javascript/check_all.js
+++ b/web/html/javascript/check_all.js
@@ -80,12 +80,6 @@ function checkbox_clicked(thebox, set_label) {
**/
function process_checkbox_clicked(thebox, set_label, checkall, children, members, parent_id ) {
- var form_name = thebox.form.name;
- if (form_name == "") {
- form_name = thebox.form.id;
- }
- var cboxes = eval("document.forms['" + form_name + "']." + thebox.name);
- process_single_checkbox(cboxes, checkall);
var a = new Array();
a.push(thebox.value);
@@ -108,6 +102,13 @@ function process_checkbox_clicked(thebox, set_label, checkall, children, members
}
process_single_checkbox(boxes, parentBox);
}
+ var form_name = thebox.form.name;
+ if (form_name == "") {
+ form_name = thebox.form.id;
+ }
+ var cboxes = eval("document.forms['" + form_name + "']." + thebox.name);
+ process_single_checkbox(cboxes, checkall);
+
update_server_set("ids", set_label, thebox.checked, a);
}
13 years, 12 months