Changes to 'refs/tags/spacewalk-web-0.7.6-1'
by Michael Mraka
Tag 'spacewalk-web-0.7.6-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-11-19 21:52 +0000
Tagging package [spacewalk-web] version [0.7.6-1] in directory [web/].
Changes since spacewalk-backend-0.7.15-1:
Justin Sherrill (4):
This patch adds the [--name|-N] option to the options parser, which allows the end user to specify
adding small fix to script to support satellite 5.0
Merge branch 'master' of ssh://jlsherrill@git.fedorahosted.org/git/spacewalk
checkstyle fix
Michael Mraka (3):
fixed typo
made conditions more readable
Automatic commit of package [spacewalk-web] release [0.7.6-1].
---
backend/server/handlers/app/packages.py | 25 ++++------
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java | 1
rel-eng/packages/spacewalk-web | 2
schema/spacewalk/common/views/views.deps | 2
scripts/channel-to-update-level/README | 4 +
scripts/channel-to-update-level/create-channel-update | 22 ++++++--
web/spacewalk-web.spec | 6 ++
7 files changed, 39 insertions(+), 23 deletions(-)
---
14 years, 5 months
Changes to 'refs/tags/spacewalk-setup-0.7.7-1'
by Michael Mraka
Tag 'spacewalk-setup-0.7.7-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-11-19 21:55 +0000
Tagging package [spacewalk-setup] version [0.7.7-1] in directory [spacewalk/setup/].
Changes since spacewalk-schema-0.7.6-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-setup] release [0.7.7-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 5 months
Changes to 'refs/tags/spacewalk-schema-0.7.6-1'
by Michael Mraka
Tag 'spacewalk-schema-0.7.6-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-11-19 21:55 +0000
Tagging package [spacewalk-schema] version [0.7.6-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-0.7.15-1:
Justin Sherrill (4):
This patch adds the [--name|-N] option to the options parser, which allows the end user to specify
adding small fix to script to support satellite 5.0
Merge branch 'master' of ssh://jlsherrill@git.fedorahosted.org/git/spacewalk
checkstyle fix
Michael Mraka (4):
fixed typo
made conditions more readable
Automatic commit of package [spacewalk-web] release [0.7.6-1].
Automatic commit of package [spacewalk-schema] release [0.7.6-1].
---
backend/server/handlers/app/packages.py | 25 ++++------
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java | 1
rel-eng/packages/spacewalk-schema | 2
rel-eng/packages/spacewalk-web | 2
schema/spacewalk/common/views/views.deps | 2
schema/spacewalk/spacewalk-schema.spec | 10 +++-
scripts/channel-to-update-level/README | 4 +
scripts/channel-to-update-level/create-channel-update | 22 ++++++--
web/spacewalk-web.spec | 6 ++
9 files changed, 49 insertions(+), 25 deletions(-)
---
14 years, 5 months
3 commits - rel-eng/packages schema/spacewalk spacewalk/setup web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
rel-eng/packages/spacewalk-setup | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
schema/spacewalk/spacewalk-schema.spec | 10 +++++++++-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
web/spacewalk-web.spec | 6 +++++-
6 files changed, 21 insertions(+), 6 deletions(-)
New commits:
commit f03b7fcfc74c9f93585feb526a9bdfd45fa2001a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 22:55:38 2009 +0100
Automatic commit of package [spacewalk-setup] release [0.7.7-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 9d93588..f623722 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-0.7.6-1 spacewalk/setup/
+0.7.7-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 5143cbb..0b8da2b 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 0.7.6
+Version: 0.7.7
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -106,6 +106,9 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
+* Thu Nov 19 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.7-1
+- make installer look more consistent
+
* Mon Oct 12 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.6-1
- added Oracle 11gR2 to allowed versions
- fixed length of db population progress bar
commit efccb38e1ed6398910cd9196c565368c911adb43
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 22:55:07 2009 +0100
Automatic commit of package [spacewalk-schema] release [0.7.6-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index e0651bb..1ad2c7d 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-0.7.5-1 schema/spacewalk/
+0.7.6-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index d22e2f4..c981165 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 0.7.5
+Version: 0.7.6
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -58,6 +58,14 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Thu Nov 19 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.6-1
+- replaced cursors + for loops with already written bulk procedure
+- removed cartesian join
+- 532683 - removed unnecessary table joins
+- fixed schema upgrades
+- optimized queries in update_perms_for_server
+- 532683 - optimized delete
+
* Thu Oct 22 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.5-1
- 449167 - record installation date of rpm package
commit 8303717c0e9d7840dd543a6c7592c9f5127c73cf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 22:52:42 2009 +0100
Automatic commit of package [spacewalk-web] release [0.7.6-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 6ed3ce6..befe346 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.7.5-1 web/
+0.7.6-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index b1bb24a..6009b1b 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.5
+Version: 0.7.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -317,6 +317,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Nov 19 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.6-1
+- 531649 - fixed confirmation message after channel merge/compare
+- 527881 - fixed set clearing on the channel merge page
+
* Mon Oct 26 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.5-1
- bump up spacewalk version to 0.7
- 449167 - add api call for rpm install date
14 years, 5 months
Branch 'sha256-support3' - 50 commits - backend/satellite_tools backend/server backend/spacewalk-backend.spec client/rhel client/tools java/code proxy/proxy-html rel-eng/packages schema/spacewalk scripts/channel-to-update-level spacewalk/certs-tools web/html web/modules
by Michael Mraka
backend/satellite_tools/spacewalk-report | 35 -
backend/satellite_tools/spacewalk-report.sgml | 27
backend/server/handlers/app/packages.py | 25
backend/server/repomd/mapper.py | 6
backend/server/rhnPackage.py | 6
backend/server/rhnPackageUpload.py | 12
backend/server/rhnServer/server_packages.py | 6
backend/spacewalk-backend.spec | 8
client/rhel/yum-rhn-plugin/rhnplugin.conf | 9
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 2
client/tools/rhncfg/config_client/rhncfgcli_elist.py | 2
client/tools/rhncfg/rhncfg.spec | 44 -
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 5
java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 6
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 5
java/code/src/com/redhat/rhn/common/db/datasource/xml/Set_queries.xml | 20
java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 6
java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 5
java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java | 15
java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 2
java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 37 -
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java | 38 -
proxy/proxy-html/spacewalk-proxy-html.spec | 24
rel-eng/packages/rhncfg | 2
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-certs-tools | 2
rel-eng/packages/spacewalk-proxy-html | 2
schema/spacewalk/common/views/rhnChecksumView.sql | 24
schema/spacewalk/common/views/views.deps | 3
schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/007-rhnChecksumView.sql | 24
scripts/channel-to-update-level/README | 4
scripts/channel-to-update-level/create-channel-update | 22
spacewalk/certs-tools/LICENSE | 339 ++++++++++
spacewalk/certs-tools/spacewalk-certs-tools.spec | 21
web/html/network/software/packages/file_list.pxt | 2
web/html/network/systems/details/history/snapshots/config.pxt | 2
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 5
web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml | 4
web/modules/sniglets/Sniglets/ListView/FileList.pm | 8
40 files changed, 584 insertions(+), 231 deletions(-)
New commits:
commit cbfb3f23da96c253759e04f99f5d067079e57863
Merge: c5eb153... 7dbc7e0...
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 22:46:40 2009 +0100
Merge branch 'master' into sha256-support3
commit 7dbc7e0e5dcc597efccdd8233171b1cb6349f094
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 13:52:51 2009 +0100
made conditions more readable
diff --git a/backend/server/handlers/app/packages.py b/backend/server/handlers/app/packages.py
index 7747978..f3da1e4 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -419,13 +419,12 @@ class Packages(RPC_Base):
orgid = info.get('org_id')
if orgid == 'null':
- org_id, force = rhnPackageUpload.authenticate(username, password,
- channels=channels,
- null_org=1,
- force=force)
+ null_org=1
else:
- org_id, force = rhnPackageUpload.authenticate(username, password,
+ null_org=None
+ org_id, force = rhnPackageUpload.authenticate(username, password,
channels=channels,
+ null_org=null_org,
force=force)
return self._getPackageMD5sum(org_id, pkg_infos, info)
@@ -439,11 +438,11 @@ class Packages(RPC_Base):
try:
if orgid == 'null':
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, null_org=1, force=force)
+ null_org=1
else:
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, force=force)
+ null_org=None
+ org_id, force = rhnPackageUpload.authenticate_session(
+ session_string, channels=channels, null_org=null_org, force=force)
except rhnSession.InvalidSessionError:
raise rhnFault(33)
except rhnSession.ExpiredSessionError:
@@ -564,11 +563,11 @@ class Packages(RPC_Base):
try:
if orgid == 'null':
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, null_org=1, force=force)
+ null_org=1
else:
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, force=force)
+ null_org=None
+ org_id, force = rhnPackageUpload.authenticate_session(
+ session_string, channels=channels, null_org=null_org, force=force)
except rhnSession.InvalidSessionError:
raise rhnFault(33)
except rhnSession.ExpiredSessionError:
commit 730f0fd719677ed6e5725c9b7f22ab1000d66637
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 10:43:45 2009 +0100
fixed typo
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index fe018f1..1704088 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -36,7 +36,7 @@ rhnChannelFamilyServerVirtual :: rhnServerEntitlementView \
rhnChannelFamilyMembers \
rhnServerChannel \
rhnServer
-hnChannelFamilyOverview :: rhnPrivateChannelFamily rhnChannelFamily
+rhnChannelFamilyOverview :: rhnPrivateChannelFamily rhnChannelFamily
rhnChannelFamilyPermissions :: rhnPublicChannelFamily \
rhnPrivateChannelFamily
rhnChannelFamilyServers :: rhnChannelFamilyMembers rhnChannelFamily \
commit 25e1e400a2108010ab494b23b9e3942d28e54f1f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Nov 19 14:02:10 2009 -0500
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
index b024e13..5d3f335 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
@@ -14,7 +14,6 @@
*/
package com.redhat.rhn.manager.kickstart.test;
-import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
commit c38637017fe785a4acc9d5161a889b2c92120a78
Merge: d8419da... 5996584...
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Nov 19 13:55:34 2009 -0500
Merge branch 'master' of ssh://jlsherrill@git.fedorahosted.org/git/spacewalk
commit 5996584526ad9a63ca3c28c18343988f0f636121
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 19 14:00:17 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.7.15-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0687db0..5a1e1a6 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.7.14
+Version: 0.7.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -580,6 +580,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Nov 19 2009 Jan Pazdziora 0.7.15-1
+- 537063 - drop the report-specific options
+
* Wed Nov 18 2009 Jan Pazdziora 0.7.14-1
- reporting: add reports "users" and "users-systems".
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index f0ffa13..dd4fddd 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.7.14-1 backend/
+0.7.15-1 backend/
commit 0a3acfa16dc946fc389efcda456e17617d383133
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 19 12:21:54 2009 +0100
537063 - drop the report-specific options, do all in generic options, also allow options after report name.
To get --list-fields --info behaviour, use --list-fields-info now.
diff --git a/backend/satellite_tools/spacewalk-report b/backend/satellite_tools/spacewalk-report
index 0143698..cd1be9e 100755
--- a/backend/satellite_tools/spacewalk-report
+++ b/backend/satellite_tools/spacewalk-report
@@ -60,44 +60,31 @@ def processCommandline():
+ ' default is default_db from /etc/rhn/rhn.conf'),
Option('--info', action='store_true',
help='print synopsis of the report in the list of report, or description of individual reports specified'),
+ Option('--list-fields', action='store_true',
+ dest='listfields',
+ help='list fields of the report instead of running the report'),
+ Option('--list-fields-info', action='store_true',
+ dest='listfieldsinfo',
+ help='as --list-fields but also prints description for each column'),
]
optionParser = OptionParser( \
- usage="usage: %s [options] [report_name [report_options]]" % sys.argv[0], \
+ usage="usage: %s [options] [report_name]" % sys.argv[0], \
option_list=optionsTable)
- optionParser.disable_interspersed_args()
options, args = optionParser.parse_args()
sys.argv[1:] = args
return options
-def processCommandlineReport(report):
- """ process the commandline options for one report """
-
- optionsTable = [
- Option('--list-fields', action='store_true',
- dest='listfields',
- help='list fields of the report instead of running the report'),
- Option('--info', action='store_true',
- help='print description for each column'),
- ]
- optionParserReport = OptionParser(
- usage="options for report %s" % report,
- option_list=optionsTable,
- )
- options, args = optionParserReport.parse_args()
-
- return options
-
-
if __name__ == '__main__':
options = processCommandline()
try:
+ if len(sys.argv) > 2:
+ systemExit(-5, 'Only one report name expected.')
if len(sys.argv) > 1:
report_name = sys.argv[1]
- report_options = processCommandlineReport(report_name)
try:
report = reports.report(report_name)
@@ -115,7 +102,7 @@ if __name__ == '__main__':
print report.description
need_exit = True
- if report_options.listfields:
+ if options.listfields or options.listfieldsinfo:
if options.info:
print
print "Fields in the report:"
@@ -125,7 +112,7 @@ if __name__ == '__main__':
text = c
if options.info:
text = " %s" % c
- if report_options.info and report.column_descriptions.has_key(c) :
+ if options.listfieldsinfo and report.column_descriptions.has_key(c) :
text = "%s: %s" % ( text, report.column_descriptions[c] )
print text
need_exit = True
diff --git a/backend/satellite_tools/spacewalk-report.sgml b/backend/satellite_tools/spacewalk-report.sgml
index 7ba8d5d..d792336 100644
--- a/backend/satellite_tools/spacewalk-report.sgml
+++ b/backend/satellite_tools/spacewalk-report.sgml
@@ -32,11 +32,9 @@ Generate reports from Spacewalk server in csv format
<sbr />
<arg>--info</arg>
<sbr />
- <arg choice='plain'><replaceable>report-name</replaceable></arg>
- <sbr />
- <arg>--list-fields <arg>--info</arg></arg>
+ <group><arg>--list-fields</arg><arg>--list-fields-info</arg></group>
<sbr />
- <arg choice='plain'>other report specific options</arg>
+ <arg choice='plain'><replaceable>report-name</replaceable></arg>
</cmdsynopsis>
</Synopsis>
</RefSynopsisDiv>
@@ -50,18 +48,11 @@ Generate reports from Spacewalk server in csv format
</para>
<para>
- The command takes some general options, specified on the command
- line before the report name. Each report may have a set of
- report-specific options, those are placed on the command line
- after the report name.
-</para>
-
-<para>
If the report name is not specified, list of available report
names is printed, one name per line.
</para>
-<RefSect1><Title>General Options</Title>
+<RefSect1><Title>Options</Title>
<variablelist>
<varlistentry>
<term>--info</term>
@@ -106,11 +97,6 @@ Generate reports from Spacewalk server in csv format
<command>spacewalk-report</command>.
</listitem>
</varlistentry>
-</variablelist>
-</RefSect1>
-
-<RefSect1><Title>Report-specific Options</Title>
-<variablelist>
<varlistentry>
<term>--list-fields</term>
<listitem>
@@ -119,10 +105,11 @@ Generate reports from Spacewalk server in csv format
</listitem>
</varlistentry>
<varlistentry>
- <term>--info</term>
+ <term>--list-fields-info</term>
<listitem>
- <para>Used with <option>--list-fields</option>, the list
- of fields has description shown as well.</para>
+ <para>Instead of running the report, shows fields that the
+ report has, one field name per line, and a description of
+ that field.</para>
</listitem>
</varlistentry>
</variablelist>
commit c5eb15338d0d842addf0d6e07ee76d1d403d3b98
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 12:17:52 2009 +0100
checksum type looks better in upper case
diff --git a/web/modules/sniglets/Sniglets/ListView/FileList.pm b/web/modules/sniglets/Sniglets/ListView/FileList.pm
index 67fd1ff..ff4e308 100644
--- a/web/modules/sniglets/Sniglets/ListView/FileList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/FileList.pm
@@ -114,7 +114,7 @@ sub row_callback {
$row->{NAME} = '<tt>' . $row->{NAME} . '</tt>';
if ($row->{CHECKSUM}) {
- $row->{CHECKSUM} = '<tt>' . $row->{CHECKSUM_TYPE} . ': ' . $row->{CHECKSUM} . '</tt>';
+ $row->{CHECKSUM} = '<tt>' . uc($row->{CHECKSUM_TYPE}) . ': ' . $row->{CHECKSUM} . '</tt>';
$row->{FILE_SIZE} = '<tt>' . PXT::Utils->commafy($row->{FILE_SIZE}) . " bytes</tt>";
}
elsif ($row->{LINKTO}) {
commit 8d7cbbe5e293b342767aab5c57bdcde6fb2d2e59
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 11:27:23 2009 +0100
fixed checksum on config.pxt page
diff --git a/web/html/network/systems/details/history/snapshots/config.pxt b/web/html/network/systems/details/history/snapshots/config.pxt
index 44a9869..35b298f 100644
--- a/web/html/network/systems/details/history/snapshots/config.pxt
+++ b/web/html/network/systems/details/history/snapshots/config.pxt
@@ -41,7 +41,7 @@ Snapshot - Configuration Files</h2>
<url>/rhn/configuration/file/FileDetails.do?crid={column:id}</url>
</column>
<column name="Revision" label="revision" width="1%"/>
- <column name="MD5 Checksum" label="md5sum" width="25%" />
+ <column name="Checksum" label="checksum" width="25%" />
<column name="Created" label="created" width="10%" />
<empty_list_message>No files</empty_list_message>
</rhn-listview>
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
index 9af09c7..0abc9be 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
@@ -519,7 +519,7 @@ ORDER BY CFN.path
<query params="ss_id">
SELECT DISTINCT
CR.id,
- Csum.checksum md5sum,
+ UPPER(Csum.checksum_type) || ': ' || Csum.checksum AS CHECKSUM,
CFN.id AS CONFIG_FILE_NAME_ID,
CFN.path,
CR.revision,
@@ -533,7 +533,7 @@ SELECT DISTINCT
rhnConfigFile CF,
rhnConfigRevision CR,
rhnSnapshotConfigRevision SCR,
- rhnChecksum Csum
+ rhnChecksumView Csum
WHERE SCR.snapshot_id = :ss_id
AND SCR.config_revision_id = CR.id
AND CR.config_content_id = CCon.id
commit b76c5333c82232e8c7e71e823cfdc21223b66229
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 11:09:17 2009 +0100
replaced rhnChecksum and rhnChecksumType join with rhnChecksumView
diff --git a/backend/server/repomd/mapper.py b/backend/server/repomd/mapper.py
index c34c940..f7c71f2 100644
--- a/backend/server/repomd/mapper.py
+++ b/backend/server/repomd/mapper.py
@@ -215,7 +215,7 @@ class SqlPackageMapper:
p.path,
sr.name source_rpm,
p.last_modified,
- ct.label checksum_type
+ c.checksum_type
from
rhnPackage p,
rhnPackageName pn,
@@ -223,8 +223,7 @@ class SqlPackageMapper:
rhnPackageArch pa,
rhnPackageGroup pg,
rhnSourceRPM sr,
- rhnChecksum c,
- rhnChecksumType ct
+ rhnChecksumView c
where
p.id = :package_id
and p.name_id = pn.id
@@ -233,7 +232,6 @@ class SqlPackageMapper:
and p.package_group = pg.id
and p.source_rpm_id = sr.id
and p.checksum_id = c.id
- and c.checksum_type_id = ct.id
""")
self.filelist_sql = rhnSQL.prepare("""
diff --git a/backend/server/rhnPackage.py b/backend/server/rhnPackage.py
index 16ec336..8bed05f 100644
--- a/backend/server/rhnPackage.py
+++ b/backend/server/rhnPackage.py
@@ -441,13 +441,11 @@ def get_package_for_checksum(org_id, checksum):
p.id
from
rhnPackage p,
- rhnChecksum c,
- rhnChecksumType ct
+ rhnChecksumView c
where p.org_id = :org_id
and p.checksum_id = c.id
and c.checksum = :checksum
- and ct.id = c.checksum_type_id
- and ct.label = :checksumtype
+ and c.checksum_type = :checksumtype
"""
h = rhnSQL.prepare(statement)
h.execute(org_id=org_id, checksum=checksum[1], checksumtype=checksum[0])
diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py
index f6306bd..5503525 100644
--- a/backend/server/rhnPackageUpload.py
+++ b/backend/server/rhnPackageUpload.py
@@ -218,12 +218,10 @@ def push_package(header, payload_stream, checksum, org_id=None, force=None,
h_path_sql = """
select ps.path path
from %s ps,
- rhnChecksum c,
- rhnChecksumType ct
+ rhnChecksumView c
where
c.checksum = :csum
- and ct.label = :ctype
- and c.checksum_type_id = ct.id
+ and c.checksum_type = :ctype
and ps.checksum_id = c.id
and (ps.org_id = :org_id or
(ps.org_id is null and :org_id is null)
@@ -248,11 +246,9 @@ def push_package(header, payload_stream, checksum, org_id=None, force=None,
update rhnpackage
set path = :path
where checksum_id = (
- select id from rhnChecksum c,
- rhnChecksumType ct
+ select id from rhnChecksumView c
where c.checksum = :csum
- and ct.label = :ctype
- and c.checksum_type_id = ct.id)
+ and c.checksum_type = :ctype)
""")
h_upd.execute(path=relative_path, ctype=checksum[0], csum=checksum[1])
diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py
index a941be0..c6ed87d 100644
--- a/backend/server/rhnServer/server_packages.py
+++ b/backend/server/rhnServer/server_packages.py
@@ -400,11 +400,9 @@ def processPackageKeyAssociations(header, checksum):
lookup_pkgid_sql = rhnSQL.prepare("""
select p.id
from rhnPackage p,
- rhnChecksum c,
- rhnChecksumType ct
+ rhnChecksumView c
where c.checksum = :csum
- and ct.label = :ctype
- and c.checksum_type_id = ct.id
+ and c.checksum_type = :ctype
and p.checksum_id = c.id
""")
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 5806da0..84a0140 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -1147,7 +1147,7 @@ GROUP BY C.id, C.name
<mode name="channel_errata_packages" class="com.redhat.rhn.frontend.dto.PackageDto">
<query params="eid, cid">
- SELECT P.id, CS.checksum, CST.label checksumtype,
+ SELECT P.id, CS.checksum, CS.checksum_type checksumtype,
PN.name || '-' || PE.version
|| '-' || PE.release || (CASE WHEN PE.epoch IS NULL THEN '' ELSE ':' || PE.epoch END)
|| '-' || PA.label name
@@ -1157,8 +1157,7 @@ GROUP BY C.id, C.name
rhnPackageName PN on P.name_id = PN.id inner join
rhnPackageEvr PE on P.evr_id = PE.id inner join
rhnPackageArch PA on P.package_arch_id = PA.id inner join
- rhnChecksum CS on P.checksum_id = CS.id inner join
- rhnChecksumType CST on CS.checksum_type_id = CST.id
+ rhnChecksumView CS on P.checksum_id = CS.id
where CP.channel_id = :cid
and EP.errata_id = :eid
ORDER by name
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index e171617..1381baa 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -1152,22 +1152,20 @@ ORDER BY UPPER(EK.keyword)
<query params="eid, org_id">
SELECT DISTINCT EFP.package_id,
CS.checksum,
- CST.label AS CHECKSUMTYPE,
+ CS.checksum_type AS CHECKSUMTYPE,
EF.filename AS FILENAME,
C.name AS CHANNEL_NAME
FROM rhnChannel C,
rhnErrataFilePackage EFP,
rhnErrataFileChannel EFC,
rhnErrataFile EF,
- rhnChecksum CS,
- rhnChecksumType CST
+ rhnChecksumView CS
WHERE EF.errata_id = :eid
AND EF.id = EFC.errata_file_id (+)
AND EF.id = EFP.errata_file_id (+)
AND EFC.channel_id IN (SELECT AC.channel_id FROM rhnAvailableChannels AC WHERE AC.org_id = :org_id)
AND EFC.channel_id = C.id
AND EF.checksum_id = CS.id
- AND CS.checksum_type_id = CST.id
ORDER BY C.name, EF.filename DESC
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 7b68962..3ad9d97 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -87,16 +87,15 @@ ORDER BY UPPER(C.name), C.version
SELECT C.name,
F.file_size,
CS.checksum,
- CST.label checksumtype,
+ CS.checksum_type checksumtype,
F.file_mode,
F.linkto,
TO_CHAR(F.mtime, 'YYYY-MM-DD HH24:MI:SS') AS MTIME
FROM rhnPackageFile F, rhnPackageCapability C,
- rhnChecksum CS, rhnChecksumType CST
+ rhnChecksumView CS
WHERE F.package_id = :pid
AND F.capability_id = C.id
AND F.checksum_id = CS.id
- AND CS.checksum_type_id = CST.id
ORDER BY UPPER(C.name)
</query>
</mode>
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index cffddc0..fc63093 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -558,7 +558,7 @@ FROM
p.build_time, p.path, p.package_size, p.payload_size,
p.copyright, p.vendor, p.build_host, p.header_start, p.header_end,
srpm.name as source_rpm, pg.name as package_group_name,
- cs.checksum, cst.label as checksumtype
+ cs.checksum, cs.checksum_type as checksumtype
FROM
rhnChannelPackage cp,
rhnPackage p
@@ -567,8 +567,7 @@ FROM
rhnPackageName pn,
rhnPackageEvr pevr,
rhnPackageArch pa,
- rhnChecksum cs,
- rhnChecksumType cst
+ rhnChecksumView cs
WHERE
cp.package_id = p.id
AND p.name_id = pn.id
@@ -576,7 +575,6 @@ FROM
AND p.package_arch_id = pa.id
AND cp.channel_id = :channel_id
AND p.checksum_id = cs.id
- AND cs.checksum_type_id = cst.id
ORDER by 1
</query>
</mode>
commit ecf2fa89a99c3ae995066a3e3c5b001f8e7cb9ad
Merge: 5f2a436... c5b0183...
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 10:44:23 2009 +0100
Merge branch 'master' into sha256-support3
commit c5b0183e830715676285a6f27c27091e34afdeab
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 10:43:45 2009 +0100
fixed typo
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index fe018f1..1704088 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -36,7 +36,7 @@ rhnChannelFamilyServerVirtual :: rhnServerEntitlementView \
rhnChannelFamilyMembers \
rhnServerChannel \
rhnServer
-hnChannelFamilyOverview :: rhnPrivateChannelFamily rhnChannelFamily
+rhnChannelFamilyOverview :: rhnPrivateChannelFamily rhnChannelFamily
rhnChannelFamilyPermissions :: rhnPublicChannelFamily \
rhnPrivateChannelFamily
rhnChannelFamilyServers :: rhnChannelFamilyMembers rhnChannelFamily \
commit 5f2a436354f2cdea15c93cb9336da390ed1bda8e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 10:41:22 2009 +0100
added rhnChecksumView
diff --git a/schema/spacewalk/common/views/rhnChecksumView.sql b/schema/spacewalk/common/views/rhnChecksumView.sql
new file mode 100644
index 0000000..4c3dfe1
--- /dev/null
+++ b/schema/spacewalk/common/views/rhnChecksumView.sql
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2009 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+
+create or replace view rhnChecksumView
+as
+select c.id,
+ ct.label checksum_type,
+ c.checksum
+ from rhnChecksum c,
+ rhnChecksumType ct
+ where c.checksum_type_id = ct.id;
+
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index fe018f1..265a788 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -46,6 +46,7 @@ rhnChannelPermissions :: rhnChannelFamilyMembers rhnPrivateChannelFam
rhnPublicChannelFamily web_contact
rhnChannelTreeView :: rhnChannel rhnChannelFamilyMembers \
rhnChannelFamilyPermissions
+rhnChecksumView :: rhnChecksum rhnChecksumType
rhnDemoOrgs :: demo_log
rhnEntitledServers :: rhnServerGroup rhnServerGroupType \
rhnServerGroupMembers rhnServer
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/007-rhnChecksumView.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/007-rhnChecksumView.sql
new file mode 100644
index 0000000..4c3dfe1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/007-rhnChecksumView.sql
@@ -0,0 +1,24 @@
+--
+-- Copyright (c) 2009 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+
+create or replace view rhnChecksumView
+as
+select c.id,
+ ct.label checksum_type,
+ c.checksum
+ from rhnChecksum c,
+ rhnChecksumType ct
+ where c.checksum_type_id = ct.id;
+
commit 21b94283c059c47f9b1e369dd4cbb8bdb0a24bc7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 10:32:56 2009 +0100
added checksum type to filelist page
diff --git a/web/html/network/software/packages/file_list.pxt b/web/html/network/software/packages/file_list.pxt
index 0d14e9b..cb16ad9 100644
--- a/web/html/network/software/packages/file_list.pxt
+++ b/web/html/network/software/packages/file_list.pxt
@@ -25,7 +25,7 @@
<rhn-listview class="Sniglets::ListView::FileList" mode="package_files">
<formvars><var name="pid" /></formvars>
<column name="Filename" label="name" align="left" />
- <column name="MD5 Sum" label="md5" align="left" />
+ <column name="Checksum" label="checksum" align="left" />
<column name="Last Modified" label="mtime" />
<column name="Size" label="file_size" align="right" />
<empty_list_message>No files.</empty_list_message>
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index c660586..6502112 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -104,12 +104,13 @@ ORDER BY created DESC
<query params="pid">
SELECT C.name,
F.file_size,
- Cs.checksum md5,
+ Cs.checksum,
+ Cs.checksum_type,
F.file_mode,
F.linkto,
TO_CHAR(F.mtime, 'YYYY-MM-DD HH24:MI:SS') AS MTIME
FROM rhnPackageFile F, rhnPackageCapability C,
- rhnChecksum Cs
+ rhnChecksumView Cs
WHERE F.package_id = :pid
AND F.capability_id = C.id
AND CS.id = F.checksum_id
diff --git a/web/modules/sniglets/Sniglets/ListView/FileList.pm b/web/modules/sniglets/Sniglets/ListView/FileList.pm
index 0a84da6..67fd1ff 100644
--- a/web/modules/sniglets/Sniglets/ListView/FileList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/FileList.pm
@@ -113,17 +113,17 @@ sub row_callback {
if ($self->datasource->mode eq 'package_files') {
$row->{NAME} = '<tt>' . $row->{NAME} . '</tt>';
- if ($row->{MD5}) {
- $row->{MD5} = '<tt>' . $row->{MD5} . '</tt>';
+ if ($row->{CHECKSUM}) {
+ $row->{CHECKSUM} = '<tt>' . $row->{CHECKSUM_TYPE} . ': ' . $row->{CHECKSUM} . '</tt>';
$row->{FILE_SIZE} = '<tt>' . PXT::Utils->commafy($row->{FILE_SIZE}) . " bytes</tt>";
}
elsif ($row->{LINKTO}) {
$row->{FILE_SIZE} = ' ';
- $row->{MD5} = "<tt>(Symlink)</tt>";
+ $row->{CHECKSUM} = "<tt>(Symlink)</tt>";
}
else {
$row->{FILE_SIZE} = ' ';
- $row->{MD5} = "<tt>(Directory)</tt>";
+ $row->{CHECKSUM} = "<tt>(Directory)</tt>";
}
}
commit 9e12526b0515d6a63fd304424b34d51a1ed06264
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 17:25:18 2009 +0100
509342 - explicitly say, that this is example
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.conf b/client/rhel/yum-rhn-plugin/rhnplugin.conf
index d8b47d8..d50adca 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.conf
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.conf
@@ -2,6 +2,11 @@
enabled = 1
gpgcheck = 1
-[rhel-i386-server-5]
-enabled = 1
+# You can specify options per channel, e.g.:
+#
+#[rhel-i386-server-5]
+#enabled = 1
+#
+#[some-unsigned-custom-channel]
+#gpgcheck = 0
commit d8419dada301b3c59e928d217c1267c651bb22ed
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Nov 18 09:57:46 2009 -0500
adding small fix to script to support satellite 5.0
diff --git a/scripts/channel-to-update-level/README b/scripts/channel-to-update-level/README
index 3a2ee28..4f632b0 100644
--- a/scripts/channel-to-update-level/README
+++ b/scripts/channel-to-update-level/README
@@ -43,6 +43,10 @@ README - This file
Changelog:
-----------
+11/18/2009 - 2.2
+- Fix broken Satellite 5.0 compatibility
+- Adding --name option to specify channel name
+
10/14/2009 - 2.1.3
- Adding 5u4 data files
diff --git a/scripts/channel-to-update-level/create-channel-update b/scripts/channel-to-update-level/create-channel-update
index f39d16e..9c16ca1 100755
--- a/scripts/channel-to-update-level/create-channel-update
+++ b/scripts/channel-to-update-level/create-channel-update
@@ -235,7 +235,10 @@ def populate(client, auth, srcChannel, newChannel, newChannelName, filename, par
nvre_to_push = splitFilename(rpm)
for src_pack in existing_packs:
if (nvre_to_push == splitPackage(src_pack)):
- if src_pack['name'] in skiplist:
+ key = 'name'
+ if not key in src_pack:
+ key = 'package_name'
+ if src_pack[key] in skiplist:
skip_num = skip_num + 1
continue
pack_num = pack_num + 1
commit 71a4cc6f993af17f296cff068631613d79a869ff
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Nov 18 09:41:41 2009 -0500
This patch adds the [--name|-N] option to the options parser, which allows the end user to specify
a channel name. The default behaviour is to set the channel name to the same as the channel label.
Written by: Jon Fautley
diff --git a/scripts/channel-to-update-level/create-channel-update b/scripts/channel-to-update-level/create-channel-update
index 2b7683e..f39d16e 100755
--- a/scripts/channel-to-update-level/create-channel-update
+++ b/scripts/channel-to-update-level/create-channel-update
@@ -44,7 +44,7 @@ client = None
def get_args():
global parser
parser = OptionParser(usage="""./create-channel-update -l USER -s SERVER [-p PASSWORD] -v VERSION -r RELEASE
- -u UPDATE -a ARCH -e EXTRA [ -D DATAFILE] [-c SRCCHAN] -d DESTCHAN [-P PARENT]
+ -u UPDATE -a ARCH -e EXTRA [ -D DATAFILE] [-c SRCCHAN] -d DESTCHAN [-N DESTNAME] [-P PARENT]
[-C | --clear] [-n | --nossl]""")
parser.add_option("-n", "--nossl", action="store_false", dest="ssl", default=True, help="disables the use of SSL when connecting to the server")
parser.add_option("-C", "--clear", action="store_true", dest="clear_channel", help="remove all channel packages from the channel before adding")
@@ -64,6 +64,7 @@ def get_args():
parser.add_option("-K", "--skiplist", action="store", dest="skiplist", help="a filename with a list of package names to ignore when adding to the destination channel")
parser.add_option("-g", "--gather", action="store_true", dest="gather", default=False , help='used to gather data files, generally not useful to most people')
parser.add_option("-b", "--bundle", action="store", dest="bundle", type='int', default='50', help='if you are getting "502 proxy" errors, try using a smaller value (default 50)')
+ parser.add_option("-N", "--name", action="store", dest="dest_name", help='if specified, set the descriptive name of the destination channel, else use channel label')
return parser.parse_args()
@@ -150,6 +151,12 @@ def main():
newChannelLabel = options.dest_channel
newChannelLabel = newChannelLabel.lower()
srcChanLabel = options.source_channel
+
+ if not options.dest_name:
+ newChannelName = options.dest_channel
+ else:
+ newChannelName = options.dest_name
+
if (srcChanLabel == None):
print "You have not specified a source channel, we will try to determine it from inputs"
srcChanLabel = findSrcChan(version, release, arch, extra)
@@ -170,10 +177,10 @@ def main():
if options.skiplist:
skiplist = read_skip_list(options.skiplist)
- populate(client, auth, srcChanLabel, newChannelLabel, filename, parent, clear, skiplist=skiplist)
+ populate(client, auth, srcChanLabel, newChannelLabel, newChannelName, filename, parent, clear, skiplist=skiplist)
-def populate(client, auth, srcChannel, newChannel, filename, parent, clear, skiplist=[]):
+def populate(client, auth, srcChannel, newChannel, newChannelName, filename, parent, clear, skiplist=[]):
chanList = client.channel.listSoftwareChannels(auth)
@@ -196,10 +203,10 @@ def populate(client, auth, srcChannel, newChannel, filename, parent, clear, skip
if new_label == None:
if not clone:
print("Creating channel, " + newChannel + ", with arch " + arch_label),
- client.channel.software.create(auth, newChannel, newChannel, newChannel, getArchLabel(arch_label, client, auth), parent)
+ client.channel.software.create(auth, newChannel, newChannelName, newChannel, getArchLabel(arch_label, client, auth), parent)
if clone:
print("Cloning channel " + srcChannel + " to " + newChannel),
- details_map = { 'name':newChannel, 'label':newChannel, 'summary':newChannel }
+ details_map = { 'name':newChannelName, 'label':newChannel, 'summary':newChannel }
if parent:
details_map['parent_label'] = parent
client.channel.software.clone(auth, srcChannel, details_map, True)
commit 34c478f84d2ced3ac81cd94df00e0ef9fa49e593
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 15:15:49 2009 +0100
515575 - require recent rhn-client tools
We need defined exception InvalidRedirectionError
addressing:
File "/usr/lib/yum-plugins/rhnplugin.py", line 318, in _getFile
except up2dateErrors.InvalidRedirectionError, e:
AttributeError: 'module' object has no attribute 'InvalidRedirectionError'
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index ff6569a..4ef49b3 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -15,7 +15,7 @@ BuildRequires: intltool
BuildRequires: gettext
Requires: yum >= 3.2.19-15
-Requires: rhn-client-tools >= 0.4.19-9
+Requires: rhn-client-tools >= 0.4.20-2
Requires: m2crypto >= 0.16-6
# Not really, but for upgrades we need these
commit ddd5f435262a44a34f608ec2211f550b200fb4e8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 18 13:26:21 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.7.14-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c9023c5..0687db0 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.7.13
+Version: 0.7.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -580,6 +580,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Nov 18 2009 Jan Pazdziora 0.7.14-1
+- reporting: add reports "users" and "users-systems".
+
* Thu Nov 12 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.7.13-1
- merged exportLib from satellite_exporter to satellite_tools
* Thu Nov 5 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.12-1
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index d764756..f0ffa13 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.7.13-1 backend/
+0.7.14-1 backend/
commit 1a8d41f0427305781f67a711c7405ad364feccb2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 11:28:17 2009 +0100
Automatic commit of package [spacewalk-proxy-html] release [0.7.2-1].
diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec
index f868ea0..4125b46 100644
--- a/proxy/proxy-html/spacewalk-proxy-html.spec
+++ b/proxy/proxy-html/spacewalk-proxy-html.spec
@@ -6,7 +6,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -42,7 +42,7 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
-* Wed Nov 18 2009 Miroslav Suchy <msuchy(a)redhat.com>
+* Wed Nov 18 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.2-1
- 494292 - use %%global instead of %%define
* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
diff --git a/rel-eng/packages/spacewalk-proxy-html b/rel-eng/packages/spacewalk-proxy-html
index eebf7fd..dce14fc 100644
--- a/rel-eng/packages/spacewalk-proxy-html
+++ b/rel-eng/packages/spacewalk-proxy-html
@@ -1 +1 @@
-0.7.1-1 proxy/proxy-html/
+0.7.2-1 proxy/proxy-html/
commit 8ea13848b309dadc444ac1956043e6cea33fc392
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 11:27:01 2009 +0100
494292 - use %global instead of %define
diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec
index e7db978..f868ea0 100644
--- a/proxy/proxy-html/spacewalk-proxy-html.spec
+++ b/proxy/proxy-html/spacewalk-proxy-html.spec
@@ -1,3 +1,5 @@
+%global htmldir %{_var}/www/html
+
Name: spacewalk-proxy-html
Summary: The HTML component for Spacewalk Proxy
Group: Applications/Internet
@@ -12,8 +14,6 @@ Obsoletes: rhns-proxy-html < 5.3.0
Provides: rhns-proxy-html = 5.3.0
Requires: httpd
-%define htmldir %{_var}/www/html
-
%description
This package contains placeholder html pages, which the Spacewalk Server
displays, if you navigate to it using your browser.
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Wed Nov 18 2009 Miroslav Suchy <msuchy(a)redhat.com>
+- 494292 - use %%global instead of %%define
+
* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
- 494292 - address issues with spec file during Fedora package review
commit 1ad706be7ca6e61569dc56c7cbbeb80a1043060a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:44:30 2009 +0100
Automatic commit of package [spacewalk-certs-tools] release [0.7.2-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 242cecf..cb1efef 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-0.7.1-1 spacewalk/certs-tools/
+0.7.2-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 6196d54..16c8396 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Wed Nov 18 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.2-1
+- 538046 - Polish the spec according Fedora Packaging Guidelines
+
* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
- fix rpmlint warnings
commit f72ee7c02a674d175991fa4b93c2b5f25b4532b2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:42:48 2009 +0100
include that documentation we already have in package
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 0cfaa73..6196d54 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -51,6 +51,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rhn-bootstrap
%doc %{_mandir}/man1/rhn-*.1*
%doc LICENSE PYTHON-LICENSES.txt
+%doc ssl-howto-simple.txt ssl-howto.txt
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
commit 1d202650e7c9c28027b21aaae8a93f927d9f5347
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:42:05 2009 +0100
538046 - require rhn-client-tools since it owns %{rhnroot}. And take ownership of %{rhnroot}/certs
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 560bd9a..0cfaa73 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -9,6 +9,7 @@ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: openssl rpm-build
+Requires: rhn-client-tools
BuildRequires: docbook-utils
BuildRequires: python
Obsoletes: rhns-certs < 5.3.0
@@ -41,6 +42,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
+%dir %{rhnroot}/certs
%{rhnroot}/certs/*.py*
%attr(755,root,root) %{rhnroot}/certs/sign.sh
%attr(755,root,root) %{rhnroot}/certs/gen-rpm.sh
commit bd040d32c44d532c3b501ab56542679e5b6d98a9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:20:39 2009 +0100
538046 - Fedora prefer %defattr(-,root,root,-)
Obey Fedora
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 34d90ea..560bd9a 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -40,7 +40,7 @@ chmod 755 $RPM_BUILD_ROOT/%{rhnroot}/certs/{rhn_ssl_tool.py,client_config_update
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{rhnroot}/certs/*.py*
%attr(755,root,root) %{rhnroot}/certs/sign.sh
%attr(755,root,root) %{rhnroot}/certs/gen-rpm.sh
commit 7bc826d955bd0b915b9e8be154182fb11c3f7c85
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:19:47 2009 +0100
538046 - use %global instead of %define
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 201050f..34d90ea 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -21,7 +21,7 @@ Provides: rhns-certs-tools = 5.3.0
This package contains tools to generate the SSL certificates required by
Spacewalk.
-%define rhnroot %{_prefix}/share/rhn
+%global rhnroot %{_datadir}/rhn
%prep
%setup -q
commit 1467b7ee1bbd7953530533da75cf06d84fb0ab6a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:15:16 2009 +0100
538046 - add python license
e.g. compile.py is based on
Python-licensed code
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index e6e347d..201050f 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -1,7 +1,7 @@
Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
-License: GPLv2
+License: GPLv2 and Python
Version: 0.7.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
@@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rhn-ssl-tool
%attr(755,root,root) %{_bindir}/rhn-bootstrap
%doc %{_mandir}/man1/rhn-*.1*
-%doc LICENSE
+%doc LICENSE PYTHON-LICENSES.txt
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
commit c552f9596ef81b2eb813557078d17822abc2446d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:14:30 2009 +0100
538046 - add LICENSE file
diff --git a/spacewalk/certs-tools/LICENSE b/spacewalk/certs-tools/LICENSE
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/spacewalk/certs-tools/LICENSE
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 8b6ed36..e6e347d 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -48,6 +48,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rhn-ssl-tool
%attr(755,root,root) %{_bindir}/rhn-bootstrap
%doc %{_mandir}/man1/rhn-*.1*
+%doc LICENSE
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
commit bf7de64c50434cdcd307538f7d93343c4d0f2439
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:08:10 2009 +0100
Automatic commit of package [rhncfg] release [5.9.14-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 5bb438d..060011d 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.13
+Version: 5.9.14
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Nov 18 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.14-1
+- 491088 - Polish the spec according Fedora Packaging Guidelines
+
* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.13-1
- 491088 - Polish the spec according Fedora Packaging Guidelines
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 24acd70..955a72e 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.13-1 client/tools/rhncfg/
+5.9.14-1 client/tools/rhncfg/
commit 8198d7d12a139a2f3255806ef8d7db7db30ca4fa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 10:03:16 2009 +0100
491088 - droping virtual provides
This has been added by Misa in 2003 (rev. 71254) for no obvious reason.
It should not be used anywhere in current code. Dropping
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 98fcfe3..5bb438d 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -17,9 +17,6 @@ BuildRequires: python
Requires: libselinux-python
Requires: python
Requires: rhnlib
-Provides: rhn-config-action = %{version}
-Provides: rhn-config-client-package = %{version}
-Provides: rhn-config-management-package = %{version}
# If this is rhel 4 or less we need up2date.
%if 0%{?rhel} && "%rhel" < "5"
Requires: up2date
@@ -34,8 +31,6 @@ The base libraries and functions needed by all rhncfg-* packages.
Summary: Red Hat Network Configuration Client
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-Provides: rhn-config-action = %{version}
-Provides: rhn-config-client-package = %{version}
%description client
A command line interface to the client features of the RHN Configuration
@@ -45,7 +40,6 @@ Management system.
Summary: Red Hat Network Configuration Management Client
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-Provides: rhn-config-management-package = %{version}
%description management
A command line interface used to manage RHN configuration.
@@ -55,8 +49,6 @@ Summary: Red Hat Network Configuration Client Actions
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: %{name}-client
-Provides: rhn-config-action = %{version}
-Provides: rhn-config-client-package = %{version}
%description actions
The code required to run configuration actions scheduled via the RHN website or
commit 27d4c7f671ef74c2f11b92bef6c7f7b564e3a66d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 09:46:41 2009 +0100
491088 - removing summary from description
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 10202f7..98fcfe3 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -28,7 +28,6 @@ Requires: rhn-client-tools
%endif
%description
-Red Hat Network Configuration Client Libraries.
The base libraries and functions needed by all rhncfg-* packages.
%package client
@@ -39,7 +38,6 @@ Provides: rhn-config-action = %{version}
Provides: rhn-config-client-package = %{version}
%description client
-Red Hat Network Configuration Client.
A command line interface to the client features of the RHN Configuration
Management system.
@@ -50,7 +48,6 @@ Requires: %{name} = %{version}-%{release}
Provides: rhn-config-management-package = %{version}
%description management
-Red Hat Network Configuration Management Client.
A command line interface used to manage RHN configuration.
%package actions
@@ -62,7 +59,6 @@ Provides: rhn-config-action = %{version}
Provides: rhn-config-client-package = %{version}
%description actions
-Red Hat Network Configuration Client Actions
The code required to run configuration actions scheduled via the RHN website or
RHN Satellite or Spacewalk.
commit 00c0edefb7cda6f9cacb2586f7e8465f78205f6e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 09:44:51 2009 +0100
491088 - move dependency on rhn-client-tools to base package
%{rhnroot} (i.e. %{_datadir}/rhn) is used in every package but rhn-client-tools
is only required in rhncfg-actions. This require should be moved up to the main
package.
%{rhnconf} (i.e. %_sysconfdir}/sysconfig/rhn) is used in the client and
management subpackages which is to be found in rhn-client-tools as well
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 402dc75..10202f7 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -20,6 +20,12 @@ Requires: rhnlib
Provides: rhn-config-action = %{version}
Provides: rhn-config-client-package = %{version}
Provides: rhn-config-management-package = %{version}
+# If this is rhel 4 or less we need up2date.
+%if 0%{?rhel} && "%rhel" < "5"
+Requires: up2date
+%else
+Requires: rhn-client-tools
+%endif
%description
Red Hat Network Configuration Client Libraries.
@@ -52,14 +58,6 @@ Summary: Red Hat Network Configuration Client Actions
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: %{name}-client
-
-# If this is rhel 4 or less we need up2date.
-%if 0%{?rhel} && "%rhel" < "5"
-Requires: up2date
-%else
-Requires: rhn-client-tools
-%endif
-
Provides: rhn-config-action = %{version}
Provides: rhn-config-client-package = %{version}
commit 766f94dc417124631fad5db2bc9373351813f4d1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 18 09:40:21 2009 +0100
491088 - license is GPLv2 and Python
e.g. compile.py is based on
Python-licensed code
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 19b829e..402dc75 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -5,7 +5,7 @@
Name: rhncfg
Summary: Red Hat Network Configuration Client Libraries
Group: Applications/System
-License: GPLv2
+License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
Version: 5.9.13
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{rhnroot}/config_common
-%doc LICENSE
+%doc LICENSE PYTHON-LICENSES.txt
%files client
%defattr(-,root,root,-)
commit 914db78b3a4f2a805e16914f62660bb7438ec11b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Nov 17 16:56:14 2009 -0500
512844 - fixing inefficient query in package set clenaup
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Set_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Set_queries.xml
index e5b88d4..b0f3844 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Set_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Set_queries.xml
@@ -239,26 +239,20 @@ DELETE
DELETE
FROM rhnSet
WHERE rowid IN(SELECT s.rowid
- FROM rhnSet S, web_contact WC
+ FROM rhnSet S, web_contact WC, rhnPackage P
WHERE S.user_id = :user_id
AND S.user_id = WC.id
AND S.label = :label
- AND NOT EXISTS(SELECT 1
- FROM dual
- WHERE EXISTS (SELECT 1
- FROM rhnPackage P
- WHERE P.id = S.element
- AND P.org_id = WC.org_id
- )
- OR EXISTS (SELECT 1
+ AND S.element = P.id
+ AND (P.org_id != WC.org_id
+ AND P.id NOT IN (SELECT CP.package_id
FROM rhnChannelPackage CP,
rhnAvailableChannels AC
WHERE AC.org_id = wc.org_id
AND AC.channel_id = CP.channel_id
- AND CP.package_id = S.element
- )
- )
- )
+ ))
+ )
+
</query>
</write-mode>
commit 091ce843ba73521c2047fa4ac24c790fa0735ddb
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Nov 17 13:25:18 2009 -0500
unit test fix - we no longer do validation checking on kickstart partitions, so no need to test it
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
index bcb7346..b024e13 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
@@ -48,43 +48,6 @@ public class KickstartPartitionCommandTest extends BaseTestCaseWithUser {
assertNull(cmd.store());
assertEquals(3, k.getPartitions().size());
- // Test for invalid partitions
- cmd = new KickstartPartitionCommand(k.getId(), user);
- partitions = "asdfasdf asdf asdf\n" +
- "partition /boot --fstype=ext3 --size=200\n" +
- "partition swap --size=2000\n" +
- "volgroup myvg pv.01\n" +
- "logvol / --vgname=myvg --name=rootvol --size=1000 --grow\n";
-
- ValidatorError e = cmd.parsePartitions(partitions);
- assertNotNull(e);
- assertEquals("kickstart.partition.invalid", e.getKey());
-
- // Test with single bad entry vs one with spaces above
- cmd = new KickstartPartitionCommand(k.getId(), user);
- partitions = "asdf\n" +
- "partition / --fstype=ext3 --size=700 --grow\n" +
- "partition /boot --fstype=ext3 --size=200\n" +
- "partition swap --size=1000 --maxsize=2000\n" +
- "volgroup myvg pv.01\n" +
- "\n\n" +
- " \n" +
- "logvol / --vgname=myvg --name=rootvol --size=1000 --grow\n\n";
-
- e = cmd.parsePartitions(partitions);
- assertNotNull(e);
- assertEquals("kickstart.partition.invalid", e.getKey());
-
- // Test blank spaces
- cmd = new KickstartPartitionCommand(k.getId(), user);
- partitions = "partition / --fstype=ext3 --size=700 --grow\n" +
- "partition /boot --fstype=ext3 --size=200\n" +
- "partition swap --size=1000 --maxsize=2000\n" +
- "volgroup myvg pv.01\n" +
- "\n" +
- "logvol / --vgname=myvg --name=rootvol --size=1000 --grow\n\n";
- assertNull(cmd.parsePartitions(partitions));
-
}
public void testLVMSwapPartitions() throws Exception {
commit 8bbff5f02a384fc63e6d052e19d72901ad507688
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Nov 17 12:21:00 2009 -0500
unit test fix - kickstart compare packages was not working correctly
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index f5349b9..5d46ce3 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -823,34 +823,33 @@ public class ProfileHandler extends BaseHandler {
loggedInUser.getOrg().getId());
// Set operations to determine deltas
- Set<KickstartPackage> onlyInProfile1 =
- new TreeSet<KickstartPackage>(profile1.getKsPackages());
- onlyInProfile1.removeAll(profile2.getKsPackages());
- Set<KickstartPackage> onlyInProfile2 =
- new TreeSet<KickstartPackage>(profile2.getKsPackages());
- onlyInProfile2.removeAll(profile1.getKsPackages());
-
- // Convert the remaining into strings for return
- Set<String> profile1PackageNameStrings = new HashSet<String>(onlyInProfile1.size());
- for (KickstartPackage ksPackage : onlyInProfile1) {
- profile1PackageNameStrings.add(ksPackage.getPackageName().getName());
- }
-
- Set<String> profile2PackageNameStrings = new HashSet<String>(onlyInProfile2.size());
- for (KickstartPackage ksPackage : onlyInProfile2) {
- profile2PackageNameStrings.add(ksPackage.getPackageName().getName());
- }
+
+ Set<String> onlyInProfile1 = getPackageNamesForKS(profile1);
+ onlyInProfile1.removeAll(getPackageNamesForKS(profile2));
+
+ Set<String> onlyInProfile2 = getPackageNamesForKS(profile2);
+ onlyInProfile2.removeAll(getPackageNamesForKS(profile1));
+
// Package for return
Map<String, Set<String>> results = new HashMap<String, Set<String>>(2);
- results.put(kickstartLabel1, profile1PackageNameStrings);
- results.put(kickstartLabel2, profile2PackageNameStrings);
+ results.put(kickstartLabel1, onlyInProfile1);
+ results.put(kickstartLabel2, onlyInProfile2);
return results;
}
+ private Set<String> getPackageNamesForKS(KickstartData ksdata) {
+ Set<String> toRet = new HashSet<String>();
+ for (KickstartPackage ksPack : ksdata.getKsPackages()) {
+ toRet.add(ksPack.getPackageName().getName());
+ }
+ return toRet;
+ }
+
+
/**
* Returns a list for each kickstart profile of properties that are different between
* the profiles. Each property that is not equal between the two profiles will be
commit 7b0b0a76a580a83f75ff57f5e5b01445d4bd793a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 17 13:12:38 2009 +0100
Automatic commit of package [spacewalk-certs-tools] release [0.7.1-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 74c5fb8..242cecf 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-0.6.3-1 spacewalk/certs-tools/
+0.7.1-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 1ff5fc9..8b6ed36 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
+- fix rpmlint warnings
+
* Wed May 06 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6.3-1
- adding optional way to specify profile name. (satoru.satoh(a)gmail.com)
- 497110 - Don't assume jabberd is installed in rhn-ssl-tool (dgoodwin(a)redhat.com)
commit 5f91bedf662b44fa9db94e198d7de65c9cc1f0ea
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 17 13:11:12 2009 +0100
fix rpmlint warnings
some python modules has been marked as executable
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 821d8c3..1ff5fc9 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -34,13 +34,14 @@ rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT/%{rhnroot}/certs
make -f Makefile.certs install PREFIX=$RPM_BUILD_ROOT ROOT=%{rhnroot} \
MANDIR=%{_mandir}
+chmod 755 $RPM_BUILD_ROOT/%{rhnroot}/certs/{rhn_ssl_tool.py,client_config_update.py,rhn_rpm.py,rhn_bootstrap.py}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%attr(755,root,root) %{rhnroot}/certs/*.py*
+%{rhnroot}/certs/*.py*
%attr(755,root,root) %{rhnroot}/certs/sign.sh
%attr(755,root,root) %{rhnroot}/certs/gen-rpm.sh
%attr(755,root,root) %{_bindir}/rhn-sudo-ssl-tool
commit 4f42fac44ef2b1b90205d8f6623e3048656df5e9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 17 12:17:52 2009 +0100
Automatic commit of package [rhncfg] release [5.9.13-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 3ed7cbf..19b829e 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.12
+Version: 5.9.13
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -111,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
-* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.12-1
+* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.13-1
- 491088 - Polish the spec according Fedora Packaging Guidelines
* Tue Oct 27 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.11-1
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index f8c7732..24acd70 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.12-1 client/tools/rhncfg/
+5.9.13-1 client/tools/rhncfg/
commit 83614a0a886a5d62b3ae509aabad386c383eeb92
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 17 12:17:30 2009 +0100
removing shebang - this file is not executable
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_elist.py b/client/tools/rhncfg/config_client/rhncfgcli_elist.py
index 6223f0f..9adf8be 100755
--- a/client/tools/rhncfg/config_client/rhncfgcli_elist.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_elist.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
from config_common.rhn_log import log_debug, die
import handler_base, base64, stat
commit b9c1b5f4f97ff5c452ef5749b16a4e3472b7e896
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 17 12:15:27 2009 +0100
rhncfg-client.noarch: E: description-line-too-long
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 3410e8c..3ed7cbf 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -34,7 +34,8 @@ Provides: rhn-config-client-package = %{version}
%description client
Red Hat Network Configuration Client.
-A command line interface to the client features of the RHN Configuration Management system.
+A command line interface to the client features of the RHN Configuration
+Management system.
%package management
Summary: Red Hat Network Configuration Management Client
commit 3eb7669d84399ad41b8550dd5b2967c39c5562d1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 17 12:12:04 2009 +0100
Automatic commit of package [rhncfg] release [5.9.12-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 2774036..3410e8c 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.11
+Version: 5.9.12
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.12-1
+- 491088 - Polish the spec according Fedora Packaging Guidelines
+
* Tue Oct 27 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.11-1
- Diff SELinux contexts (joshua.roys(a)gtri.gatech.edu)
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 3eed1e7..f8c7732 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.11-1 client/tools/rhncfg/
+5.9.12-1 client/tools/rhncfg/
commit 77f05446550166cfd1ca7f523ede55def6b76791
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 17 12:00:30 2009 +0100
491088 - better %description
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 07cbb11..2774036 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -22,7 +22,8 @@ Provides: rhn-config-client-package = %{version}
Provides: rhn-config-management-package = %{version}
%description
-Red Hat Network Configuration Client Libraries
+Red Hat Network Configuration Client Libraries.
+The base libraries and functions needed by all rhncfg-* packages.
%package client
Summary: Red Hat Network Configuration Client
@@ -32,7 +33,8 @@ Provides: rhn-config-action = %{version}
Provides: rhn-config-client-package = %{version}
%description client
-Red Hat Network Configuration Client
+Red Hat Network Configuration Client.
+A command line interface to the client features of the RHN Configuration Management system.
%package management
Summary: Red Hat Network Configuration Management Client
@@ -41,7 +43,8 @@ Requires: %{name} = %{version}-%{release}
Provides: rhn-config-management-package = %{version}
%description management
-Red Hat Network Configuration Management Client
+Red Hat Network Configuration Management Client.
+A command line interface used to manage RHN configuration.
%package actions
Summary: Red Hat Network Configuration Client Actions
@@ -61,6 +64,8 @@ Provides: rhn-config-client-package = %{version}
%description actions
Red Hat Network Configuration Client Actions
+The code required to run configuration actions scheduled via the RHN website or
+RHN Satellite or Spacewalk.
%prep
%setup -q
commit 999c53aaaa8c0897df34babe85d8af19d12f8504
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 17 11:09:27 2009 +0100
Automatic commit of package [spacewalk-proxy-html] release [0.7.1-1].
diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec
index 7ae0a23..e7db978 100644
--- a/proxy/proxy-html/spacewalk-proxy-html.spec
+++ b/proxy/proxy-html/spacewalk-proxy-html.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.7.0
+Version: 0.7.1
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Tue Nov 17 2009 Miroslav Suchy <msuchy(a)redhat.com> 0.7.1-1
+- 494292 - address issues with spec file during Fedora package review
+
* Mon Dec 8 2008 Michael Mraka <michael.mraka(a)redhat.com> 0.4.2-1
- fixed Obsoletes: rhns-* < 5.3.0
diff --git a/rel-eng/packages/spacewalk-proxy-html b/rel-eng/packages/spacewalk-proxy-html
index 4a4bea3..eebf7fd 100644
--- a/rel-eng/packages/spacewalk-proxy-html
+++ b/rel-eng/packages/spacewalk-proxy-html
@@ -1 +1 @@
-0.4.2-1 proxy/proxy-html/
+0.7.1-1 proxy/proxy-html/
commit ceee8d49b8622f44dba816bfb5bbe9894ca85472
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 17 08:58:59 2009 +0100
fix typo
diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec
index 734b59d..7ae0a23 100644
--- a/proxy/proxy-html/spacewalk-proxy-html.spec
+++ b/proxy/proxy-html/spacewalk-proxy-html.spec
@@ -16,7 +16,7 @@ Requires: httpd
%description
This package contains placeholder html pages, which the Spacewalk Server
-display, if you navigate to it using your browser.
+displays, if you navigate to it using your browser.
%prep
%setup -q
commit e5ed9449621bfc9d03c8470b5ae37e37abe2fec7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Nov 17 08:57:37 2009 +0100
add Provides: to pair with Obsolete:
diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec
index b564bdc..734b59d 100644
--- a/proxy/proxy-html/spacewalk-proxy-html.spec
+++ b/proxy/proxy-html/spacewalk-proxy-html.spec
@@ -9,6 +9,7 @@ Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
BuildArch: noarch
Obsoletes: rhns-proxy-html < 5.3.0
+Provides: rhns-proxy-html = 5.3.0
Requires: httpd
%define htmldir %{_var}/www/html
commit 33b94be077682b1198fb433c0affa9ce04500066
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Nov 13 17:02:00 2009 +0100
494292 - no need to own htmldir, httpd already own it
diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec
index 68c7cc4..b564bdc 100644
--- a/proxy/proxy-html/spacewalk-proxy-html.spec
+++ b/proxy/proxy-html/spacewalk-proxy-html.spec
@@ -34,7 +34,6 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%dir %{htmldir}
%dir %{htmldir}/_rhn_proxy
%config %{htmldir}/_rhn_proxy/index.html
%{htmldir}/_rhn_proxy/*.ico
commit 9ea1125a5cb90f7bc8f8b44c38aef54e79a513c7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Nov 13 16:55:39 2009 +0100
494292 - use deffattr
diff --git a/proxy/proxy-html/spacewalk-proxy-html.spec b/proxy/proxy-html/spacewalk-proxy-html.spec
index a217863..68c7cc4 100644
--- a/proxy/proxy-html/spacewalk-proxy-html.spec
+++ b/proxy/proxy-html/spacewalk-proxy-html.spec
@@ -34,11 +34,11 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%attr(755,root,apache) %dir %{htmldir}
-%attr(755,root,apache) %dir %{htmldir}/_rhn_proxy
-%attr(644,root,apache) %config %{htmldir}/_rhn_proxy/index.html
-%attr(644,root,apache) %{htmldir}/_rhn_proxy/*.ico
-%attr(644,root,apache) %{htmldir}/_rhn_proxy/*.png
+%dir %{htmldir}
+%dir %{htmldir}/_rhn_proxy
+%config %{htmldir}/_rhn_proxy/index.html
+%{htmldir}/_rhn_proxy/*.ico
+%{htmldir}/_rhn_proxy/*.png
%doc LICENSE
%changelog
commit 5a8c271358b4da0f355d333c86a0739420488067
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 16 18:14:10 2009 -0500
537491 - fixing issue with cloned kickstart profiles losing the package list during cloning
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
index deb5fa7..631e68f 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java
@@ -1238,9 +1238,10 @@ public class KickstartData {
cloned.setKickstartDefaults(this.getKickstartDefaults().deepCopy(cloned));
}
cloned.setOrg(this.getOrg());
- if (this.getKsPackages() != null) {
- cloned.setKsPackages(new TreeSet(this.getKsPackages()));
+ for (KickstartPackage kp : this.getKsPackages()) {
+ cloned.getKsPackages().add(kp.deepCopy(cloned));
}
+
if (this.getPreserveFileLists() != null) {
cloned.setPreserveFileLists(new HashSet(this.getPreserveFileLists()));
}
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
index 8e8bb70..a6ba39b 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartPackage.java
@@ -132,7 +132,7 @@ public class KickstartPackage
return equal;
}
- int comparism = this.getKsData().getId().compareTo(that.getKsData().getId());
+ int comparism = this.getKsData().getLabel().compareTo(that.getKsData().getLabel());
if (equal != comparism) {
return comparism;
}
@@ -174,4 +174,17 @@ public class KickstartPackage
", " + this.getPosition().toString() +
", " + this.getPackageName().getName() + " }";
}
+
+ /**
+ * Produce a clone of a kickstartPackage object
+ * @param data The new kickstart data
+ * @return the clone
+ */
+ public KickstartPackage deepCopy(KickstartData data) {
+ KickstartPackage kp = new KickstartPackage();
+ kp.setKsData(data);
+ kp.setPackageName(this.getPackageName());
+ kp.setPosition(this.getPosition());
+ return kp;
+ }
}
diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
index 6c44cea..1f1cd7d 100644
--- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
+++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java
@@ -694,7 +694,7 @@ public class KickstartDataTest extends BaseTestCaseWithUser {
verifySet(cloned.getDefaultRegTokens(), k.getDefaultRegTokens(), Token.class);
verifySet(cloned.getLogvols(), k.getLogvols(), KickstartCommand.class);
- verifySet(cloned.getKsPackages(), k.getKsPackages(), PackageName.class);
+ verifySet(cloned.getKsPackages(), k.getKsPackages(), KickstartPackage.class);
verifySet(cloned.getPreserveFileLists(), k.getPreserveFileLists(), FileList.class);
verifySet(cloned.getRaids(), k.getRaids(), KickstartCommand.class);
verifySet(cloned.getVolgroups(), k.getVolgroups(), KickstartCommand.class);
commit 43097cd96aff80f8ae7318d29124ec30c03c6aed
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Nov 16 18:00:16 2009 -0500
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java b/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
index d6e7c66..722f1e2 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/test/NewUserEventTest.java
@@ -75,9 +75,9 @@ public class NewUserEventTest extends RhnBaseTestCase {
assertTrue(mailer.getBody().contains("Your Spacewalk login: testUser") ||
mailer.getBody().contains("Your RHN Satellite login: testUser"));
assertTrue(mailer.getBody().contains("Your Spacewalk email address: " +
- "redhatJavaTest(a)redhat.com") ||
+ "redhatJavaTest(a)redhat.com") ||
mailer.getBody().contains("Your RHN Satellite email address: " +
- "redhatJavaTest(a)redhat.com"));
+ "redhatJavaTest(a)redhat.com"));
}
private NewUserEvent createTestEvent() {
14 years, 5 months
2 commits - backend/server schema/spacewalk
by Michael Mraka
backend/server/handlers/app/packages.py | 25 ++++++++++++-------------
schema/spacewalk/common/views/views.deps | 2 +-
2 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 7dbc7e0e5dcc597efccdd8233171b1cb6349f094
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 13:52:51 2009 +0100
made conditions more readable
diff --git a/backend/server/handlers/app/packages.py b/backend/server/handlers/app/packages.py
index 7747978..f3da1e4 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -419,13 +419,12 @@ class Packages(RPC_Base):
orgid = info.get('org_id')
if orgid == 'null':
- org_id, force = rhnPackageUpload.authenticate(username, password,
- channels=channels,
- null_org=1,
- force=force)
+ null_org=1
else:
- org_id, force = rhnPackageUpload.authenticate(username, password,
+ null_org=None
+ org_id, force = rhnPackageUpload.authenticate(username, password,
channels=channels,
+ null_org=null_org,
force=force)
return self._getPackageMD5sum(org_id, pkg_infos, info)
@@ -439,11 +438,11 @@ class Packages(RPC_Base):
try:
if orgid == 'null':
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, null_org=1, force=force)
+ null_org=1
else:
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, force=force)
+ null_org=None
+ org_id, force = rhnPackageUpload.authenticate_session(
+ session_string, channels=channels, null_org=null_org, force=force)
except rhnSession.InvalidSessionError:
raise rhnFault(33)
except rhnSession.ExpiredSessionError:
@@ -564,11 +563,11 @@ class Packages(RPC_Base):
try:
if orgid == 'null':
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, null_org=1, force=force)
+ null_org=1
else:
- org_id, force = rhnPackageUpload.authenticate_session(
- session_string, channels=channels, force=force)
+ null_org=None
+ org_id, force = rhnPackageUpload.authenticate_session(
+ session_string, channels=channels, null_org=null_org, force=force)
except rhnSession.InvalidSessionError:
raise rhnFault(33)
except rhnSession.ExpiredSessionError:
commit 730f0fd719677ed6e5725c9b7f22ab1000d66637
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Nov 19 10:43:45 2009 +0100
fixed typo
diff --git a/schema/spacewalk/common/views/views.deps b/schema/spacewalk/common/views/views.deps
index fe018f1..1704088 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -36,7 +36,7 @@ rhnChannelFamilyServerVirtual :: rhnServerEntitlementView \
rhnChannelFamilyMembers \
rhnServerChannel \
rhnServer
-hnChannelFamilyOverview :: rhnPrivateChannelFamily rhnChannelFamily
+rhnChannelFamilyOverview :: rhnPrivateChannelFamily rhnChannelFamily
rhnChannelFamilyPermissions :: rhnPublicChannelFamily \
rhnPrivateChannelFamily
rhnChannelFamilyServers :: rhnChannelFamilyMembers rhnChannelFamily \
14 years, 5 months
4 commits - java/code scripts/channel-to-update-level
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java | 1
scripts/channel-to-update-level/README | 4 +
scripts/channel-to-update-level/create-channel-update | 22 +++++++---
3 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 25e1e400a2108010ab494b23b9e3942d28e54f1f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Nov 19 14:02:10 2009 -0500
checkstyle fix
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
index b024e13..5d3f335 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartPartitionCommandTest.java
@@ -14,7 +14,6 @@
*/
package com.redhat.rhn.manager.kickstart.test;
-import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
commit c38637017fe785a4acc9d5161a889b2c92120a78
Merge: d8419da... 5996584...
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Nov 19 13:55:34 2009 -0500
Merge branch 'master' of ssh://jlsherrill@git.fedorahosted.org/git/spacewalk
commit d8419dada301b3c59e928d217c1267c651bb22ed
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Nov 18 09:57:46 2009 -0500
adding small fix to script to support satellite 5.0
diff --git a/scripts/channel-to-update-level/README b/scripts/channel-to-update-level/README
index 3a2ee28..4f632b0 100644
--- a/scripts/channel-to-update-level/README
+++ b/scripts/channel-to-update-level/README
@@ -43,6 +43,10 @@ README - This file
Changelog:
-----------
+11/18/2009 - 2.2
+- Fix broken Satellite 5.0 compatibility
+- Adding --name option to specify channel name
+
10/14/2009 - 2.1.3
- Adding 5u4 data files
diff --git a/scripts/channel-to-update-level/create-channel-update b/scripts/channel-to-update-level/create-channel-update
index f39d16e..9c16ca1 100755
--- a/scripts/channel-to-update-level/create-channel-update
+++ b/scripts/channel-to-update-level/create-channel-update
@@ -235,7 +235,10 @@ def populate(client, auth, srcChannel, newChannel, newChannelName, filename, par
nvre_to_push = splitFilename(rpm)
for src_pack in existing_packs:
if (nvre_to_push == splitPackage(src_pack)):
- if src_pack['name'] in skiplist:
+ key = 'name'
+ if not key in src_pack:
+ key = 'package_name'
+ if src_pack[key] in skiplist:
skip_num = skip_num + 1
continue
pack_num = pack_num + 1
commit 71a4cc6f993af17f296cff068631613d79a869ff
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Nov 18 09:41:41 2009 -0500
This patch adds the [--name|-N] option to the options parser, which allows the end user to specify
a channel name. The default behaviour is to set the channel name to the same as the channel label.
Written by: Jon Fautley
diff --git a/scripts/channel-to-update-level/create-channel-update b/scripts/channel-to-update-level/create-channel-update
index 2b7683e..f39d16e 100755
--- a/scripts/channel-to-update-level/create-channel-update
+++ b/scripts/channel-to-update-level/create-channel-update
@@ -44,7 +44,7 @@ client = None
def get_args():
global parser
parser = OptionParser(usage="""./create-channel-update -l USER -s SERVER [-p PASSWORD] -v VERSION -r RELEASE
- -u UPDATE -a ARCH -e EXTRA [ -D DATAFILE] [-c SRCCHAN] -d DESTCHAN [-P PARENT]
+ -u UPDATE -a ARCH -e EXTRA [ -D DATAFILE] [-c SRCCHAN] -d DESTCHAN [-N DESTNAME] [-P PARENT]
[-C | --clear] [-n | --nossl]""")
parser.add_option("-n", "--nossl", action="store_false", dest="ssl", default=True, help="disables the use of SSL when connecting to the server")
parser.add_option("-C", "--clear", action="store_true", dest="clear_channel", help="remove all channel packages from the channel before adding")
@@ -64,6 +64,7 @@ def get_args():
parser.add_option("-K", "--skiplist", action="store", dest="skiplist", help="a filename with a list of package names to ignore when adding to the destination channel")
parser.add_option("-g", "--gather", action="store_true", dest="gather", default=False , help='used to gather data files, generally not useful to most people')
parser.add_option("-b", "--bundle", action="store", dest="bundle", type='int', default='50', help='if you are getting "502 proxy" errors, try using a smaller value (default 50)')
+ parser.add_option("-N", "--name", action="store", dest="dest_name", help='if specified, set the descriptive name of the destination channel, else use channel label')
return parser.parse_args()
@@ -150,6 +151,12 @@ def main():
newChannelLabel = options.dest_channel
newChannelLabel = newChannelLabel.lower()
srcChanLabel = options.source_channel
+
+ if not options.dest_name:
+ newChannelName = options.dest_channel
+ else:
+ newChannelName = options.dest_name
+
if (srcChanLabel == None):
print "You have not specified a source channel, we will try to determine it from inputs"
srcChanLabel = findSrcChan(version, release, arch, extra)
@@ -170,10 +177,10 @@ def main():
if options.skiplist:
skiplist = read_skip_list(options.skiplist)
- populate(client, auth, srcChanLabel, newChannelLabel, filename, parent, clear, skiplist=skiplist)
+ populate(client, auth, srcChanLabel, newChannelLabel, newChannelName, filename, parent, clear, skiplist=skiplist)
-def populate(client, auth, srcChannel, newChannel, filename, parent, clear, skiplist=[]):
+def populate(client, auth, srcChannel, newChannel, newChannelName, filename, parent, clear, skiplist=[]):
chanList = client.channel.listSoftwareChannels(auth)
@@ -196,10 +203,10 @@ def populate(client, auth, srcChannel, newChannel, filename, parent, clear, skip
if new_label == None:
if not clone:
print("Creating channel, " + newChannel + ", with arch " + arch_label),
- client.channel.software.create(auth, newChannel, newChannel, newChannel, getArchLabel(arch_label, client, auth), parent)
+ client.channel.software.create(auth, newChannel, newChannelName, newChannel, getArchLabel(arch_label, client, auth), parent)
if clone:
print("Cloning channel " + srcChannel + " to " + newChannel),
- details_map = { 'name':newChannel, 'label':newChannel, 'summary':newChannel }
+ details_map = { 'name':newChannelName, 'label':newChannel, 'summary':newChannel }
if parent:
details_map['parent_label'] = parent
client.channel.software.clone(auth, srcChannel, details_map, True)
14 years, 5 months
Changes to 'refs/tags/spacewalk-backend-0.7.15-1'
by Jan Pazdziora
Tag 'spacewalk-backend-0.7.15-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-11-19 13:00 +0000
Tagging package [spacewalk-backend] version [0.7.15-1] in directory [backend/].
Changes since spacewalk-backend-0.7.14-1:
Jan Pazdziora (2):
537063 - drop the report-specific options, do all in generic options, also allow options after report name.
Automatic commit of package [spacewalk-backend] release [0.7.15-1].
Miroslav Suchý (2):
515575 - require recent rhn-client tools
509342 - explicitly say, that this is example
---
backend/satellite_tools/spacewalk-report | 35 +++++++------------------
backend/satellite_tools/spacewalk-report.sgml | 27 +++++--------------
backend/spacewalk-backend.spec | 5 ++-
client/rhel/yum-rhn-plugin/rhnplugin.conf | 9 +++++-
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 2 -
rel-eng/packages/spacewalk-backend | 2 -
6 files changed, 31 insertions(+), 49 deletions(-)
---
14 years, 5 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5996584526ad9a63ca3c28c18343988f0f636121
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 19 14:00:17 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.7.15-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 0687db0..5a1e1a6 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.7.14
+Version: 0.7.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -580,6 +580,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Nov 19 2009 Jan Pazdziora 0.7.15-1
+- 537063 - drop the report-specific options
+
* Wed Nov 18 2009 Jan Pazdziora 0.7.14-1
- reporting: add reports "users" and "users-systems".
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index f0ffa13..dd4fddd 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.7.14-1 backend/
+0.7.15-1 backend/
14 years, 5 months
backend/satellite_tools
by Jan Pazdziora
backend/satellite_tools/spacewalk-report | 35 ++++++++------------------
backend/satellite_tools/spacewalk-report.sgml | 27 +++++---------------
2 files changed, 18 insertions(+), 44 deletions(-)
New commits:
commit 0a3acfa16dc946fc389efcda456e17617d383133
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Nov 19 12:21:54 2009 +0100
537063 - drop the report-specific options, do all in generic options, also allow options after report name.
To get --list-fields --info behaviour, use --list-fields-info now.
diff --git a/backend/satellite_tools/spacewalk-report b/backend/satellite_tools/spacewalk-report
index 0143698..cd1be9e 100755
--- a/backend/satellite_tools/spacewalk-report
+++ b/backend/satellite_tools/spacewalk-report
@@ -60,44 +60,31 @@ def processCommandline():
+ ' default is default_db from /etc/rhn/rhn.conf'),
Option('--info', action='store_true',
help='print synopsis of the report in the list of report, or description of individual reports specified'),
+ Option('--list-fields', action='store_true',
+ dest='listfields',
+ help='list fields of the report instead of running the report'),
+ Option('--list-fields-info', action='store_true',
+ dest='listfieldsinfo',
+ help='as --list-fields but also prints description for each column'),
]
optionParser = OptionParser( \
- usage="usage: %s [options] [report_name [report_options]]" % sys.argv[0], \
+ usage="usage: %s [options] [report_name]" % sys.argv[0], \
option_list=optionsTable)
- optionParser.disable_interspersed_args()
options, args = optionParser.parse_args()
sys.argv[1:] = args
return options
-def processCommandlineReport(report):
- """ process the commandline options for one report """
-
- optionsTable = [
- Option('--list-fields', action='store_true',
- dest='listfields',
- help='list fields of the report instead of running the report'),
- Option('--info', action='store_true',
- help='print description for each column'),
- ]
- optionParserReport = OptionParser(
- usage="options for report %s" % report,
- option_list=optionsTable,
- )
- options, args = optionParserReport.parse_args()
-
- return options
-
-
if __name__ == '__main__':
options = processCommandline()
try:
+ if len(sys.argv) > 2:
+ systemExit(-5, 'Only one report name expected.')
if len(sys.argv) > 1:
report_name = sys.argv[1]
- report_options = processCommandlineReport(report_name)
try:
report = reports.report(report_name)
@@ -115,7 +102,7 @@ if __name__ == '__main__':
print report.description
need_exit = True
- if report_options.listfields:
+ if options.listfields or options.listfieldsinfo:
if options.info:
print
print "Fields in the report:"
@@ -125,7 +112,7 @@ if __name__ == '__main__':
text = c
if options.info:
text = " %s" % c
- if report_options.info and report.column_descriptions.has_key(c) :
+ if options.listfieldsinfo and report.column_descriptions.has_key(c) :
text = "%s: %s" % ( text, report.column_descriptions[c] )
print text
need_exit = True
diff --git a/backend/satellite_tools/spacewalk-report.sgml b/backend/satellite_tools/spacewalk-report.sgml
index 7ba8d5d..d792336 100644
--- a/backend/satellite_tools/spacewalk-report.sgml
+++ b/backend/satellite_tools/spacewalk-report.sgml
@@ -32,11 +32,9 @@ Generate reports from Spacewalk server in csv format
<sbr />
<arg>--info</arg>
<sbr />
- <arg choice='plain'><replaceable>report-name</replaceable></arg>
- <sbr />
- <arg>--list-fields <arg>--info</arg></arg>
+ <group><arg>--list-fields</arg><arg>--list-fields-info</arg></group>
<sbr />
- <arg choice='plain'>other report specific options</arg>
+ <arg choice='plain'><replaceable>report-name</replaceable></arg>
</cmdsynopsis>
</Synopsis>
</RefSynopsisDiv>
@@ -50,18 +48,11 @@ Generate reports from Spacewalk server in csv format
</para>
<para>
- The command takes some general options, specified on the command
- line before the report name. Each report may have a set of
- report-specific options, those are placed on the command line
- after the report name.
-</para>
-
-<para>
If the report name is not specified, list of available report
names is printed, one name per line.
</para>
-<RefSect1><Title>General Options</Title>
+<RefSect1><Title>Options</Title>
<variablelist>
<varlistentry>
<term>--info</term>
@@ -106,11 +97,6 @@ Generate reports from Spacewalk server in csv format
<command>spacewalk-report</command>.
</listitem>
</varlistentry>
-</variablelist>
-</RefSect1>
-
-<RefSect1><Title>Report-specific Options</Title>
-<variablelist>
<varlistentry>
<term>--list-fields</term>
<listitem>
@@ -119,10 +105,11 @@ Generate reports from Spacewalk server in csv format
</listitem>
</varlistentry>
<varlistentry>
- <term>--info</term>
+ <term>--list-fields-info</term>
<listitem>
- <para>Used with <option>--list-fields</option>, the list
- of fields has description shown as well.</para>
+ <para>Instead of running the report, shows fields that the
+ report has, one field name per line, and a description of
+ that field.</para>
</listitem>
</varlistentry>
</variablelist>
14 years, 5 months