backend/satellite_tools
by Michael Mraka
backend/satellite_tools/exporter/exportLib.py | 42 +++++++++++++++++---------
1 file changed, 29 insertions(+), 13 deletions(-)
New commits:
commit 967885cb830481be59cba937fb90b2feb1774157
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Apr 29 12:12:56 2010 +0200
implemented <checksums> in <rhn-package-short>
diff --git a/backend/satellite_tools/exporter/exportLib.py b/backend/satellite_tools/exporter/exportLib.py
index 265fc8c..6c68926 100644
--- a/backend/satellite_tools/exporter/exportLib.py
+++ b/backend/satellite_tools/exporter/exportLib.py
@@ -748,21 +748,37 @@ class ShortPackagesDumper(BaseDumper):
return h
def dump_subelement(self, data):
- attributes = {}
- attrs = [
- "id", "name", "version", "release", "epoch",
- "package_arch", "checksum_type", "checksum", "package_size",
- ]
- for attr in attrs:
- attributes[string.replace(attr, '_', '-')] = data[attr]
- attributes['id'] = "rhn-package-%s" % data['id']
- attributes['epoch'] = data['epoch'] or ""
- attributes['last-modified'] = _dbtime2timestamp(data['last_modified'])
- attributes['org-id'] = data['org_id'] or ""
- d = EmptyDumper(self._writer, 'rhn-package-short',
- attributes=attributes)
+ d = ShortPackageEntryDumper(self._writer, data)
d.dump()
+class ShortPackageEntryDumper(BaseRowDumper):
+ tag_name = 'rhn-package-short'
+
+ def set_attributes(self):
+ attr = {
+ 'id' : "rhn-package-%s" % self._row['id'],
+ 'name' : self._row['name'],
+ 'version' : self._row['version'],
+ 'release' : self._row['release'],
+ 'epoch' : self._row['epoch'] or "",
+ 'package-arch' : self._row['package_arch'],
+ 'package-size' : self._row['package_size'],
+ 'last-modified' : _dbtime2timestamp(self._row['last_modified']),
+ 'org-id' : self._row['org_id'] or "",
+ }
+ if self._row['checksum_type'] == 'md5':
+ # compatibility with older satellite
+ attr['md5sum'] = self._row['checksum']
+ return attr
+
+ def set_iterator(self):
+ # checksums
+ checksum_arr = [{'type': self._row['checksum_type'],
+ 'value': self._row['checksum']}]
+ arr = [_ChecksumDumper(self._writer,
+ data_iterator=ArrayIterator(checksum_arr))]
+ return ArrayIterator(arr)
+
##
class SourcePackagesDumper(BaseDumper):
tag_name = 'rhn-source-packages'
13 years, 12 months
Changes to 'refs/tags/rhn-client-tools-1.1.2-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.1.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-04-29 11:42 +0000
Tagging package [rhn-client-tools] version [1.1.2-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-backend-1.1.8-1:
Miroslav Suchý (2):
make koji happy - add loginAuth.pkl to buildroot although we are not gonna to install it
Automatic commit of package [rhn-client-tools] release [1.1.2-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 +++--
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
---
13 years, 12 months
2 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 +++--
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 8160a2d616016ac99b5440b5abb89868ccabdb35
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 29 13:42:34 2010 +0200
Automatic commit of package [rhn-client-tools] release [1.1.2-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 9bae9c6..12676a5 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.1.1
+Version: 1.1.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -246,7 +246,7 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/applications/rhn_register.desktop
%changelog
-* Thu Apr 29 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.1-1
+* Thu Apr 29 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.2-1
- 585386 - do not fail if file do not exist
- bump up version
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 3a48dff..b3883e8 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.1.1-1 client/rhel/rhn-client-tools/
+1.1.2-1 client/rhel/rhn-client-tools/
commit 80bf54f4fd2650415a4de3a1ae223318faa96f60
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 29 13:41:48 2010 +0200
make koji happy - add loginAuth.pkl to buildroot although we are not gonna to install it
addressing:
Checking for unpackaged file(s): /usr/lib/rpm/check-files /var/tmp/rhn-client-tools-1.0.1-1.el5-root-mockbuild
RPM build errors:
File not found: /var/tmp/rhn-client-tools-1.0.1-1.el5-root-mockbuild/var/spool/up2date/loginAuth.pkl
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 72a7920..9bae9c6 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -97,6 +97,7 @@ make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} PREFIX=$
mkdir -p $RPM_BUILD_ROOT/var/lib/up2date
mkdir -pm700 $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date
+touch $RPM_BUILD_ROOT%{_localstatedir}/spool/up2date/loginAuth.pkl
desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=rhn rhn_register.desktop
%if 0%{?suse_version}
13 years, 12 months
Changes to 'refs/tags/spacewalk-backend-1.1.8-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.1.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-04-29 11:41 +0000
Tagging package [spacewalk-backend] version [1.1.8-1] in directory [backend/].
Changes since spacewalk-backend-1.1.7-1:
Jan Pazdziora (2):
Fix typo -- the double colon is not good.
Automatic commit of package [spacewalk-backend] release [1.1.8-1].
---
backend/satellite_tools/satsync.py | 2 +-
backend/spacewalk-backend.spec | 4 ++--
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
13 years, 12 months
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/satellite_tools/satsync.py | 2 +-
backend/spacewalk-backend.spec | 4 ++--
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 934411f167831041900d56548d38f78a136588e1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 29 13:41:33 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.1.8-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index dd60e33..33b45bb 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.7
+Version: 1.1.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -629,7 +629,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
-* Thu Apr 29 2010 Jan Pazdziora 1.1.7-1
+* Thu Apr 29 2010 Jan Pazdziora 1.1.8-1
- 585233 - replace has-comps with rhn-channel-comps-last-modified.
- 585233 - use the rhn-channel-comps-last-modified element instead of boolean
has-comps.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index f65b4a8..790744f 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.1.7-1 backend/
+1.1.8-1 backend/
commit fee2e39fd7c92bdb47027a321665030d8026672e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 29 13:41:10 2010 +0200
Fix typo -- the double colon is not good.
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 607aa56..9a5a65d 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -690,7 +690,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
for label in requested_channels:
timestamp = self._channel_collection.get_channel_timestamp(label)
ch = self._channel_collection.get_channel(label, timestamp)
- if ch.has_key('comps_last_modified') and ch['comps_last_modified'] != None::
+ if ch.has_key('comps_last_modified') and ch['comps_last_modified'] != None:
self._process_comps(importer.backend, label, sync_handlers._to_timestamp(ch['comps_last_modified']))
except InvalidChannelFamilyError:
13 years, 12 months
Changes to 'refs/tags/spacewalk-backend-1.1.7-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.1.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-04-29 11:23 +0000
Tagging package [spacewalk-backend] version [1.1.7-1] in directory [backend/].
Changes since rhn-client-tools-1.1.1-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.1.7-1].
---
backend/spacewalk-backend.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
---
13 years, 12 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit b7c58ff55c52b36546ab89d17f324905e41a2dcc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Apr 29 13:23:24 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.1.7-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6be9729..dd60e33 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.6
+Version: 1.1.7
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -629,6 +629,15 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Apr 29 2010 Jan Pazdziora 1.1.7-1
+- 585233 - replace has-comps with rhn-channel-comps-last-modified.
+- 585233 - use the rhn-channel-comps-last-modified element instead of boolean
+ has-comps.
+- fixed HandlerWrap class implementation from commit
+ 356bddff66b3f7c50ff06f7062d8d111c3f189ff (michael.mraka(a)redhat.com)
+- rhnLib's timestamp2dbtime not used anywhere, removing as dead code.
+- The checksumtype is now called checksum_type.
+
* Tue Apr 27 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.1.6-1
- implemented dump version 3.6 in rhn-satellite-exporter
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 5025627..f65b4a8 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.1.6-1 backend/
+1.1.7-1 backend/
13 years, 12 months
Changes to 'refs/tags/rhn-client-tools-1.1.1-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.1.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-04-29 11:07 +0000
Tagging package [rhn-client-tools] version [1.1.1-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-java-1.1.8-1:
Miroslav Suchý (2):
585386 - do not fail if file do not exist
Automatic commit of package [rhn-client-tools] release [1.1.1-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 8 ++++++--
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
---
13 years, 12 months
2 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 8 ++++++--
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit c1ca153e5b761e8581aecda7bc9114db8705248d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 29 13:07:39 2010 +0200
Automatic commit of package [rhn-client-tools] release [1.1.1-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index aea0ad3..72a7920 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.1.0
+Version: 1.1.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -245,6 +245,10 @@ make -f Makefile.rhn-client-tools test
%{_datadir}/applications/rhn_register.desktop
%changelog
+* Thu Apr 29 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.1.1-1
+- 585386 - do not fail if file do not exist
+- bump up version
+
* Wed Apr 28 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.0.1-1
- 585386 - set properly acl for /var/spool/up2date/loginAuth.pkl
- make read_cpuinfo() more readable
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index ec2fc5f..3a48dff 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.0.1-1 client/rhel/rhn-client-tools/
+1.1.1-1 client/rhel/rhn-client-tools/
commit 5031a7f392c9bc19757c7be7b4b1b0e555a6e2f9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 29 13:03:53 2010 +0200
585386 - do not fail if file do not exist
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 54ca56c..aea0ad3 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -106,7 +106,7 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications --vendor=rh
%find_lang %{name}
%post
-rm %{_localstatedir}/spool/up2date/loginAuth.pkl
+rm -f %{_localstatedir}/spool/up2date/loginAuth.pkl
%post -n rhn-setup-gnome
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
13 years, 12 months
Changes to 'refs/tags/spacewalk-java-1.1.8-1'
by Tomas Lestach
Tag 'spacewalk-java-1.1.8-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-04-29 11:05 +0000
Tagging package [spacewalk-java] version [1.1.8-1] in directory [java/].
Changes since rhn-client-tools-1.0.1-1:
Jan Pazdziora (6):
585233 - use the rhn-channel-comps-last-modified element instead of boolean has-comps.
585233 - replace has-comps with rhn-channel-comps-last-modified for disk channel dumps.
585233 - replace has-comps with rhn-channel-comps-last-modified for disk channel dumps.
585233 - replace has-comps with rhn-channel-comps-last-modified for inter-sat-sync.
585233 - replace has-comps with rhn-channel-comps-last-modified for inter-sat-sync.
585233 - use the exportLib._dbtime2timestamp approach.
Michael Mraka (1):
fixed HandlerWrap class implementation
Miroslav Suchý (1):
bump up version
Partha Aji (2):
Fixed a Compile typo to work with 1.5 compiler
Added all the javascript macgic needed to show and hide stuff
Simon Lukasik (2):
Fixing return value
Adding shebang
Tomas Lestach (4):
rename {lookup,find}ByOsReleaseAndChannelArch -> ByProductNameReleaseAndChannelArch
add 2 new DistChannelMap related queries with appropriate methods
introducing DistChannelHandler
Automatic commit of package [spacewalk-java] release [1.1.8-1].
---
backend/satellite_exporter/satexport.py | 8
backend/satellite_tools/disk_dumper/dumper.py | 13
backend/satellite_tools/exporter/exportLib.py | 20 +
backend/satellite_tools/satsync.py | 4
backend/satellite_tools/xmlSource.py | 3
backend/server/importlib/importLib.py | 1
client/rhel/rhn-client-tools/rhn-client-tools.spec | 2
client/rhel/rhnlib/test/19-redirects.py | 13
client/rhel/rhnlib/test/test_server.py | 5
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 65 ++-
java/code/src/com/redhat/rhn/domain/channel/DistChannelMap.hbm.xml | 30 +
java/code/src/com/redhat/rhn/frontend/action/channel/ssm/BaseSubscribeAction.java | 3
java/code/src/com/redhat/rhn/frontend/taglibs/list/ExpandableColumnTag.java | 25 +
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTag.java | 36 +
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagHelper.java | 35 +
java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java | 11
java/code/src/com/redhat/rhn/frontend/taglibs/list/NonExpandableColumnTag.java | 2
java/code/src/com/redhat/rhn/frontend/taglibs/list/decorators/ExpansionDecorator.java | 60 +++
java/code/src/com/redhat/rhn/frontend/taglibs/list/row/ExpandableRowRenderer.java | 35 +
java/code/src/com/redhat/rhn/frontend/taglibs/list/row/RowRenderer.java | 24 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/NoSuchDistChannelMapException.java | 36 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/distchannel/DistChannelHandler.java | 121 ++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/handler-manifest.xml | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/DistChannelMapSerializer.java | 65 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java | 1
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 12
java/code/src/com/redhat/rhn/manager/channel/test/ChannelManagerTest.java | 4
java/code/src/com/redhat/rhn/manager/system/DuplicateSystemGrouping.java | 1
java/code/webapp/WEB-INF/decorators/layout_head.jsp | 1
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp | 6
java/spacewalk-java.spec | 12
rel-eng/packages/spacewalk-java | 2
web/html/javascript/tree.js | 187 ++++++++++
33 files changed, 763 insertions(+), 81 deletions(-)
---
13 years, 12 months