backend/satellite_tools/disk_dumper/dumper.py | 5 - client/rhel/rhn-client-tools/rhn-client-tools.spec | 93 ++++++++++++++++++++- java/spacewalk-java.spec | 77 +++++++++++++++++ rel-eng/packages/rhn-client-tools | 2 rel-eng/packages/spacewalk-java | 2 rel-eng/packages/spacewalk-setup | 2 spacewalk/setup/bin/spacewalk-setup | 2 spacewalk/setup/spacewalk-setup.spec | 5 - 8 files changed, 179 insertions(+), 9 deletions(-)

New commits: commit 49797ab72c1c1c12408705aec409a7f86dc805b3 Merge: 0a6d245... 5bab334... Author: Partha Aji paji@redhat.com Date: Thu Jun 17 12:07:01 2010 -0400

Merge branch 'master' into fve

commit 5bab33477f780b55dc2ac0ec1b122ad78ee62861 Author: Michael Mraka michael.mraka@redhat.com Date: Thu Jun 17 16:59:06 2010 +0200

fixed wording for incompatible checksum error

diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py index 91a7e98..d79693d 100644 --- a/backend/satellite_tools/disk_dumper/dumper.py +++ b/backend/satellite_tools/disk_dumper/dumper.py @@ -483,7 +483,10 @@ class XML_Dumper: label) if not (iss_slave_sha256_capable or all_channels_hash[label]['checksum_type'] in [None, 'sha1']): - raise rhnFault(3001, "Channel %s has incompatible checksum (%)" % + raise rhnFault(3001, + "Channel %s has incompatible rpm checksum (%s). Please contact\n" + + "Red Hat support for information about upgrade to newer version\n" + + "of Satellite Server which supports it." % (label, all_channels_hash[label]['checksum_type'])) channels[label] = all_channels_hash[label]

commit b8d4a0529b816b95e83964003cb9b148600f8505 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 14:53:04 2010 +0200

Getopt::Long not used in spacewalk-setup, removing.

We parse the options in Spacewalk::Setup now.

diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index de75201..7cd94d7 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -34,7 +34,6 @@ use DBI; use Digest::MD5 qw/md5_hex/; use DateTime; use Sys::Hostname; -use Getopt::Long; use Spacewalk::Setup; use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC);

commit 16fe1a3fc81c43b4b86879653d8a1b7c672931af Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jun 17 14:29:01 2010 +0200

ReadLine nor ReadMode not used in spacewalk-setup, removing.

diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 868c42f..de75201 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -28,7 +28,6 @@ foreach my $t (@ARGV) { use Params::Validate; Params::Validate::validation_options(strip_leading => "-");

-use Term::ReadKey qw/ReadLine ReadMode/; use Mail::RFC822::Address; use File::Spec; use DBI;

commit 560bf5df6ee6d2daa1f98cf972c6e76e2c3d77ad Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jun 17 10:41:08 2010 +0200

Automatic commit of package [spacewalk-setup] release [1.1.2-1].

diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index 4ec6856..25c8244 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -1.1.1-1 spacewalk/setup/ +1.1.2-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index 7ed0915..69947d9 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk

@@ -99,6 +99,9 @@ rm -rf %{buildroot} %attr(755, apache, root) %{_var}/spacewalk

%changelog +* Thu Jun 17 2010 Miroslav Suchý msuchy@redhat.com 1.1.2-1 +- fun aside, swimmer meet shark (msuchy@redhat.com) + * Mon Apr 19 2010 Michael Mraka michael.mraka@redhat.com 1.1.1-1 - bumping spec files to 1.1 packages - Move systemlogs directory out of /var/satellite

commit 2409f5250c2a3c96d71c610251875eca929979a0 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jun 17 10:39:33 2010 +0200

Automatic commit of package [spacewalk-java] release [1.1.12-1].

diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index d822f54..04a69d3 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -19,7 +19,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.1.11 +Version: 1.1.12 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -321,6 +321,81 @@ fi %{jardir}/postgresql-jdbc.jar

%changelog +* Thu Jun 17 2010 Miroslav Suchý msuchy@redhat.com 1.1.12-1 +- Made the duplicate compares page do confirm delete differently + (paji@redhat.com) +- Added a sort of 'confirm' logic for delete systems in dup compares page + (paji@redhat.com) +- 602591 - "Content-Length" added to response header for different download + contents (tlestach@redhat.com) +- 603890 - fix/rewrite system.listSubscribableBaseChannels API + (tlestach@redhat.com) +- 576314 - fix for errata being added to the email queue multiple times before + it can be run (jsherril@redhat.com) +- bumping up heap to 512m for jsp compiles (shughes@redhat.com) +- bumping up build heap to 512m (shughes@redhat.com) +- Removed an unnecessary abstraction for VirtEntitlements (paji@redhat.com) +- 591291 - associate packages also (when mergeing errata) (tlestach@redhat.com) +- 601656 - fix channel permission check for errata.clone (tlestach@redhat.com) +- 601656 - fix channel permission check for channel.software.mergePackages + (tlestach@redhat.com) +- fixing issue where package summary could be null, causing NPE + (jsherril@redhat.com) +- 601656 - fix channel permission check (tlestach@redhat.com) +- 591291 - clone errata instead of associating them to custom channels + (tlestach@redhat.com) +- fixing hashCode for Errata (tlestach@redhat.com) +- 529359: Fixed a couple of bugs related to Remote Command Package upgrade + (paji@redhat.com) +- 595473 525588 - fixing small query issue and moving the ssm operation + creation to before the (jsherril@redhat.com) +- 595473 525588 - fixing issue where child channel subscription changes would + not use the stored procedure and would instead update rhnServerChannel table + directly, bypassing all entitelment logic (jsherril@redhat.com) +- 525588 - changing SSM child channel subscription page to not use hibernate + when doing subscribng (jsherril@redhat.com) +- Correct 'checkstyle' errors (colin.coe@gmail.com) +- checkstyle fixes (jsherril@redhat.com) +- Update errata.setDetails to allow setting CVEs (colin.coe@gmail.com) +- Allow CVEs to be set on unpublished errata (colin.coe@gmail.com) +- 585176 - fixing issue where packages were excluded from update on SSM + upgradable packages page when the packages had multiple arches + (jsherril@redhat.com) +- 585965 - fixing issue with multilib packages and errata-cache generation, + where updating one arch of a package would indicate that the other one was + updated as well (jsherril@redhat.com) +- 563859 - fixing issue where adding errata to x86_64 channels would only get + packages of one arch, even if the errata had two (lib packages) + (jsherril@redhat.com) +- unit test fix (jsherril@redhat.com) +- Adding the correct checkstyle for inactive systems (paji@redhat.com) +- 576953 - fixing errata search case sensitivity and not searching on partial + cve name (jsherril@redhat.com) +- 588367 - introducing systemgroup.scheduleApplyErrataToActive API call + (tlestach@redhat.com) +- 588367 move applyErrataHelper to ErrataManager (tlestach@redhat.com) +- Added the dupe compare css and javascript magic (paji@redhat.com) +- 590204 - fixing issue where pagination wasnt working properly on normal user + list page (jsherril@redhat.com) +- Made the default dups compare page preselect a bunch of items + (paji@redhat.com) +- Improved a error message on Dups systems page (paji@redhat.com) +- Fix style of commit c4e387bbb1c5cf16f54a2fa968a5613121bc1d7a + (lukas.durfina@gmail.com) +- A more functional dupes compare page (paji@redhat.com) +- adding distro deletion to cleanup script (jsherril@redhat.com) +- Removed a no white space after a type cast check since we are not enforcing + it anywhere (paji@redhat.com) +- unit test fix (jsherril@redhat.com) +- Generate Debian repository (lukas.durfina@gmail.com) +- Fixed broken unit tests (paji@redhat.com) +- checkstyle fix (joshua.roys@gtri.gatech.edu) +- Updated a typo in the string (paji@redhat.com) +- Updated a resource string (paji@redhat.com) +- Added i18n strings for the systemdetails page (paji@redhat.com) +- Limit automatic config comparisons to diff enabled systems + (joshua.roys@gtri.gatech.edu) + * Mon May 10 2010 Partha Aji paji@redhat.com 1.1.11-1 - Added an option to selectively delete instead of reactivate when a system is being reprovisioned (paji@redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 67345d2..e81a753 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.1.11-1 java/ +1.1.12-1 java/

commit 4f00896f58070f65fb5c16a371c89ebbc3a47d20 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Jun 17 10:37:56 2010 +0200

Automatic commit of package [rhn-client-tools] release [1.1.7-1].

diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index 768eeee..9064605 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -4,7 +4,7 @@ Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools -Version: 1.1.6 +Version: 1.1.7 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -280,6 +280,97 @@ make -f Makefile.rhn-client-tools test %endif

%changelog +* Thu Jun 17 2010 Miroslav Suchý msuchy@redhat.com 1.1.7-1 +- l10n: Updates to Chinese (China) (zh_CN) translation + (leahliu@fedoraproject.org) +- 601683 - properly import get_computer_info routine (mzazrivec@redhat.com) +- 596237 - use correct constant in HardwareWindow (tui) (mzazrivec@redhat.com) +- 596237 - use constants in SendingWindow (mzazrivec@redhat.com) +- 596237 - use constants in SendWindow (mzazrivec@redhat.com) +- 596237 - use constants in PackagesWindow (mzazrivec@redhat.com) +- 596237 - use constants in HardwareWindow (mzazrivec@redhat.com) +- 596237 - use constants in OSReleaseWindow & AlreadyRegisteredWindow + (mzazrivec@redhat.com) +- l10n: Updates to Russian (ru) translation (ypoyarko@fedoraproject.org) +- 600316 - don't traceback for zero subscribed channels (mzazrivec@redhat.com) +- l10n: Updates to Russian (ru) translation (ypoyarko@fedoraproject.org) +- l10n: Updates to Russian (ru) translation (ypoyarko@fedoraproject.org) +- l10n: Updates to Russian (ru) translation (ypoyarko@fedoraproject.org) +- l10n: Updates to Spanish (Castilian) (es) translation + (gguerrer@fedoraproject.org) +- 598890 - always return product version as string (mzazrivec@redhat.com) +- l10n: Updates to Spanish (Castilian) (es) translation + (gguerrer@fedoraproject.org) +- Remove three more exceptions that are not used in our code base. + (jpazdziora@redhat.com) +- The rhn-client-tools ChangeLog has't been updated since 2002, removing. + (jpazdziora@redhat.com) +- Removing WarningDialog, OkDialog, and QuestionDialog that are not used in our + code. (jpazdziora@redhat.com) +- Remove 23 exceptions that are not used in our code base. + (jpazdziora@redhat.com) +- Method resetServerList not used in our code, removing. + (jpazdziora@redhat.com) +- When startRhnCheck was replaced by spawnRhnCheckForUI, it became unused, + removing. (jpazdziora@redhat.com) +- Method getFailedSystemSlots not used in our code, removing. + (jpazdziora@redhat.com) +- get_device_property not used in our code, removing. (jpazdziora@redhat.com) +- termsAndConditions not used in our code, removing. (jpazdziora@redhat.com) +- sat_supports_virt_guest_registration not used in our code, removing. + (jpazdziora@redhat.com) +- finishMessage not used in our code, removing. (jpazdziora@redhat.com) +- When autoActivateNumbersOnce was removed, autoActivatedHardwareInfo was made + unused, removing. (jpazdziora@redhat.com) +- When ActivateSubscriptionPage was removed, activatedRegistrationNumber was + made unused, removing. (jpazdziora@redhat.com) +- 597263 - give the focus to the ButtonBar (and thus to the Yes button), to + behave as RHEL 5 did. (jpazdziora@redhat.com) +- 596101 - skip the chooseChannelPage when going Back as well, if it should not + be shown. (jpazdziora@redhat.com) +- 596102 - fit hw profile into a 2x6 table (mzazrivec@redhat.com) +- 595688 - cancel busy cursor after ValidationError (michael.mraka@redhat.com) +- 595837 - write nice error in case of "connection reset by peer" and xmlrpc + protocol error (msuchy@redhat.com) +- 585188 - we need to implement fatalError for loginPageApply and + createProfilePageApply. (jpazdziora@redhat.com) +- Remove except which cannot be reached. (jpazdziora@redhat.com) +- 585188 - refactor the RHN Register firstboot code to match firstboot 1.110 on + Fedora 12 and RHEL 6. (jpazdziora@redhat.com) +- 585188 - only install legacy firstboot on RHEL 5 (and earlier), the new + firstboot for other systems. (jpazdziora@redhat.com) +- 585188 - the firstboot modules for RHEL 5 shall retire in firstboot-legacy- + rhel5. (jpazdziora@redhat.com) +- 593194 - fix creating the $(PREFIX)/usr/share/setuptool/setuptool.d when + building the package. (jpazdziora@redhat.com) +- 595669 - fix regexp and do not fail if regexp do not match + (msuchy@redhat.com) +- whitespace cleanup (msuchy@redhat.com) +- We don't need hwdata target anymore (mzazrivec@redhat.com) +- 580493 - use correct product logos in rhn_register (gui) + (mzazrivec@redhat.com) +- 557059 - do not fail on IBM-ESXS controler where ID_PATH is not set + (msuchy@redhat.com) +- 580489 - fix requires for rhn-setup-gnome (mzazrivec@redhat.com) +- python-hwdata finaly made it into Fedora and Epel so we can remove from this + package and depend on python-hwdata (msuchy@redhat.com) +- 593194 - 99rhn_register to add RHN Register to setup's list of tools. + (jpazdziora@redhat.com) +- The bugzilla 556290 had errata released, python-setuptools should be pulled + in by python-coverage. (jpazdziora@redhat.com) +- 584780 - move the firstboot _gui.* files to rhn-setup-gnome. + (jpazdziora@redhat.com) +- 557059 - we cannot have class None. (jpazdziora@redhat.com) +- 591798 - Completly remove hal code from rhn-client-tools for F-13 and RHEL-6 + (msuchy@redhat.com) +- 591422 - add hwdata.py to rhn-client-tools. (jpazdziora@redhat.com) +- l10n: Updates to German (de) translation (ttrinks@fedoraproject.org) +- l10n update .pot and .po files for rhn-client-tools (msuchy@redhat.com) +- l10n - translate desktop file too (msuchy@redhat.com) +- cleanup - removing translation file, which does not match any language code + (msuchy@redhat.com) +- update po files for rhn-client-tools (msuchy@redhat.com) + * Wed May 05 2010 Jan Pazdziora 1.1.3-1 - 589100 - address issue when clients were not able to register to the server.

diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools index 9233bb1..e3e11da 100644 --- a/rel-eng/packages/rhn-client-tools +++ b/rel-eng/packages/rhn-client-tools @@ -1 +1 @@ -1.1.6-1 client/rhel/rhn-client-tools/ +1.1.7-1 client/rhel/rhn-client-tools/