spacewalk-commits December 2013

spacewalk-commits@lists.fedorahosted.org

11 participants
227 discussions

java/code
by Michael Mraka 02 Dec '13

02 Dec '13

java/code/webapp/WEB-INF/includes/legends/system-legend.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b5aefe004eb6839ede6e0cff62635496f4f4368c Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Dec 2 13:46:56 2013 +0100 bootstrap tuning: match legend icon with displayed one diff --git a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp index 61a702d..4738a39 100644 --- a/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp +++ b/java/code/webapp/WEB-INF/includes/legends/system-legend.jsp @@ -21,6 +21,6 @@ </rhn:require> <li><bean:message key="systemlist.jsp.virthost"/></li> <li><bean:message key="systemlist.jsp.virtguest"/></li> - <li><bean:message key="systemlist.jsp.nonvirt"/></li> + <li><bean:message key="systemlist.jsp.nonvirt"/></li> </ul> </div>

1 0

Changes to 'refs/tags/spacewalk-schema-2.1.30-1'
by Michael Mraka 02 Dec '13

02 Dec '13

Tag 'spacewalk-schema-2.1.30-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-02 10:29 +0000 Tagging package [spacewalk-schema] version [2.1.30-1] in directory [schema/spacewalk/]. Changes since spacecmd-2.1.16-1: Michael Mraka (3): 1034742 - support for new Raspberry Pi arch (armv6hl) 1034742 - schema upgrade for armv6hl arch Automatic commit of package [spacewalk-schema] release [2.1.30-1]. Silvio Moioli (2): Add a missing translation string: system.entitle.guestcantvirt system.entitle.guestcantvirt: phrase corrected --- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 +++ rel-eng/packages/spacewalk-schema | 2 - schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql | 3 + schema/spacewalk/common/data/rhnPackageArch.sql | 2 + schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql | 3 + schema/spacewalk/spacewalk-schema.spec | 6 ++- schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql | 17 ++++++++++ 7 files changed, 37 insertions(+), 2 deletions(-) ---

1 0

3 commits - rel-eng/packages schema/spacewalk
by Michael Mraka 02 Dec '13

02 Dec '13

rel-eng/packages/spacewalk-schema | 2 - schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql | 3 + schema/spacewalk/common/data/rhnPackageArch.sql | 2 + schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql | 3 + schema/spacewalk/spacewalk-schema.spec | 6 ++- schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql | 17 ++++++++++ 6 files changed, 31 insertions(+), 2 deletions(-) New commits: commit d3934f6561c829add6ac0109d2e49da4a12b62bb Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Dec 2 11:29:00 2013 +0100 Automatic commit of package [spacewalk-schema] release [2.1.30-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 03b9653..fe3ae16 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -2.1.29-1 schema/spacewalk/ +2.1.30-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index f594dcb..55bfa29 100644 --- a/schema/spacewalk/spacewalk-schema.spec +++ b/schema/spacewalk/spacewalk-schema.spec @@ -4,7 +4,7 @@ Name: spacewalk-schema Group: Applications/Internet Summary: Oracle SQL schema for Spacewalk server -Version: 2.1.29 +Version: 2.1.30 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Mon Dec 02 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.30-1 +- 1034742 - schema upgrade for armv6hl arch +- 1034742 - support for new Raspberry Pi arch (armv6hl) + * Fri Nov 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.29-1 - 1034742 - support for new Raspberry Pi arch (armv6hl) commit f68c8cd7dc286a9062783580379b051092a7aa52 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Dec 2 11:27:48 2013 +0100 1034742 - schema upgrade for armv6hl arch tables missed in commit 18d44b300cf14ca32d689cbc74a4113fb2f75ec8 diff --git a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql index e1fa8ef..4f11cf2 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-2.0-to-spacewalk-schema-2.1/036-armv6hl.sql @@ -1,9 +1,26 @@ insert into rhnCpuArch (id, label, name) values (sequence_nextval('rhn_cpu_arch_id_seq'), 'armv6hl', 'ARMv6hl'); + +insert into rhnPackageArch (id, label, name, arch_type_id) values +(sequence_nextval('rhn_package_arch_id_seq'), 'armv6hl', 'ARMv6hl', lookup_arch_type('rpm')); + + insert into rhnServerArch (id, label, name, arch_type_id) values (sequence_nextval('rhn_server_arch_id_seq'), 'armv6hl-redhat-linux', 'armv6hl', lookup_arch_type('rpm')); + +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv6hl'), current_timestamp, current_timestamp); + +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6hl'), LOOKUP_PACKAGE_ARCH('armv6hl'), current_timestamp, current_timestamp); + +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6hl'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp); + + +insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id) +values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv6hl')); + + insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values (LOOKUP_SERVER_ARCH('armv6hl-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-arm')); commit 90a63199001136dd5a8abdd03803a6cd33c89c33 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Mon Dec 2 11:20:13 2013 +0100 1034742 - support for new Raspberry Pi arch (armv6hl) more lookup tables missed in commit f00b51cb858aab62a1d32b2435a118aeb4a43079 diff --git a/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql b/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql index 8e5817c..684cd64 100644 --- a/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql +++ b/schema/spacewalk/common/data/rhnChannelPackageArchCompat.sql @@ -83,6 +83,9 @@ insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id) values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv5tel')); insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id) +values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv6hl')); + +insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id) values (LOOKUP_CHANNEL_ARCH('channel-arm'), LOOKUP_PACKAGE_ARCH('armv6l')); insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id) diff --git a/schema/spacewalk/common/data/rhnPackageArch.sql b/schema/spacewalk/common/data/rhnPackageArch.sql index 16dfc3a..d36fc1c 100644 --- a/schema/spacewalk/common/data/rhnPackageArch.sql +++ b/schema/spacewalk/common/data/rhnPackageArch.sql @@ -79,6 +79,8 @@ insert into rhnPackageArch (id, label, name, arch_type_id) values insert into rhnPackageArch (id, label, name, arch_type_id) values (sequence_nextval('rhn_package_arch_id_seq'), 'armv7l', 'ARMv7l', lookup_arch_type('rpm')); insert into rhnPackageArch (id, label, name, arch_type_id) values +(sequence_nextval('rhn_package_arch_id_seq'), 'armv6hl', 'ARMv6hl', lookup_arch_type('rpm')); +insert into rhnPackageArch (id, label, name, arch_type_id) values (sequence_nextval('rhn_package_arch_id_seq'), 'armv6l', 'ARMv6l', lookup_arch_type('rpm')); insert into rhnPackageArch (id, label, name, arch_type_id) values (sequence_nextval('rhn_package_arch_id_seq'), 'armv5tel', 'ARMv5tel', lookup_arch_type('rpm')); diff --git a/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql b/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql index d9c87f9..9da33a8 100644 --- a/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql +++ b/schema/spacewalk/common/data/rhnPackageUpgradeArchCompat.sql @@ -80,6 +80,9 @@ insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_i insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv7l'), current_timestamp, current_timestamp); insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7l'), LOOKUP_PACKAGE_ARCH('armv7l'), current_timestamp, current_timestamp); insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv7l'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv6hl'), current_timestamp, current_timestamp); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6hl'), LOOKUP_PACKAGE_ARCH('armv6hl'), current_timestamp, current_timestamp); +insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6hl'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp); insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('noarch'), LOOKUP_PACKAGE_ARCH('armv6l'), current_timestamp, current_timestamp); insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6l'), LOOKUP_PACKAGE_ARCH('armv6l'), current_timestamp, current_timestamp); insert into rhnPackageUpgradeArchCompat (package_arch_id, package_upgrade_arch_id, created, modified) values (LOOKUP_PACKAGE_ARCH('armv6l'), LOOKUP_PACKAGE_ARCH('noarch'), current_timestamp, current_timestamp);

1 0

java/code
by Silvio Moioli 02 Dec '13

02 Dec '13

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6259cf64d6743145c73e6d250a78edbff6586de0 Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Dec 2 10:14:57 2013 +0100 system.entitle.guestcantvirt: phrase corrected diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 8b3dc0c..18d3753 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -6930,7 +6930,7 @@ Follow this url to see the full list of inactive systems: </context-group> </trans-unit> <trans-unit id="system.entitle.guestcantvirt"> - <source>The system cannot have a Virtualization entitlement because it is not a virtual guest.</source> + <source>The system cannot have a Virtualization entitlement because it is a virtual guest.</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/systems/details/Overview.do</context> </context-group>

1 0

java/code
by Silvio Moioli 02 Dec '13

02 Dec '13

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit 63ca2cb6488147df49ee6ec2a2c9645a750c210e Author: Silvio Moioli <smoioli(a)suse.de> Date: Mon Dec 2 09:04:33 2013 +0100 Add a missing translation string: system.entitle.guestcantvirt diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index c519126..8b3dc0c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -6929,6 +6929,12 @@ Follow this url to see the full list of inactive systems: <context context-type="sourcefile">/rhn/systems/details/Overview.do</context> </context-group> </trans-unit> + <trans-unit id="system.entitle.guestcantvirt"> + <source>The system cannot have a Virtualization entitlement because it is not a virtual guest.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/details/Overview.do</context> + </context-group> + </trans-unit> <trans-unit id="system.invalidsystem"> <source>Invalid system</source> </trans-unit>

1 0

Changes to 'refs/tags/spacecmd-2.1.16-1'
by Milan Zazrivec 01 Dec '13

01 Dec '13

Tag 'spacecmd-2.1.16-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-12-01 10:24 +0000 Tagging package [spacecmd] version [2.1.16-1] in directory [spacecmd/]. Changes since spacewalk-java-2.1.85-1: Milan Zazrivec (2): 835979 - don't double convert start time 'now' Automatic commit of package [spacecmd] release [2.1.16-1]. --- rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 5 ++++- spacecmd/src/lib/system.py | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) ---

1 0

2 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by Milan Zazrivec 01 Dec '13

01 Dec '13

rel-eng/packages/spacecmd | 2 +- spacecmd/spacecmd.spec | 5 ++++- spacecmd/src/lib/system.py | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) New commits: commit 7c5454d0c737658b7cfd8527ee7ab67bc652a3ec Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Sun Dec 1 11:24:45 2013 +0100 Automatic commit of package [spacecmd] release [2.1.16-1]. diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd index d3152de..9c9f5df 100644 --- a/rel-eng/packages/spacecmd +++ b/rel-eng/packages/spacecmd @@ -1 +1 @@ -2.1.15-1 spacecmd/ +2.1.16-1 spacecmd/ diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec index d5a419b..22df27c 100644 --- a/spacecmd/spacecmd.spec +++ b/spacecmd/spacecmd.spec @@ -4,7 +4,7 @@ %endif Name: spacecmd -Version: 2.1.15 +Version: 2.1.16 Release: 1%{?dist} Summary: Command-line interface to Spacewalk and Satellite servers @@ -64,6 +64,9 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py %doc %{_mandir}/man1/spacecmd.1.gz %changelog +* Sun Dec 01 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.16-1 +- 835979 - don't double convert start time 'now' + * Fri Nov 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.15-1 - Making code more "pythonic" commit ddcaf0a5df86f3377f2698ce4641d8df5c4b702c Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Sun Dec 1 11:23:54 2013 +0100 835979 - don't double convert start time 'now' diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py index 31fde5c..820681b 100644 --- a/spacecmd/src/lib/system.py +++ b/spacecmd/src/lib/system.py @@ -364,8 +364,10 @@ def do_system_runscript(self, args): options.timeout = 600 else: options.timeout = int(options.timeout) - if not options.start_time: options.start_time = parse_time_input('now') - options.start_time = parse_time_input(options.start_time) + if not options.start_time: + options.start_time = parse_time_input('now') + else: + options.start_time = parse_time_input(options.start_time) if not options.file: logging.error('A script file is required')

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits December 2013