4 commits - rel-eng/packages web/spacewalk-web.spec
by Tomas Lestach
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 48bf79f350d8b04df5e3293d66e097e2248322b2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 13:40:28 2013 +0200
Automatic commit of package [spacewalk-web] release [2.1.12-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 069f51d..02b2c6e 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.11-1 web/
+2.1.12-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 9d18f5d..7613603 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.11
+Version: 2.1.12
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -273,6 +273,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Aug 28 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.12-1
+- 1001997 - let spacewalk-base-minimal require spacewalk-base-minimal-config
+
* Thu Aug 22 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.11-1
- removing old perl code associated with dead perl pages
- removing old perl pages
commit 5ee39bbe486475d99943e8147259876d1035b913
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 13:39:49 2013 +0200
1001997 - let spacewalk-base-minimal require spacewalk-base-minimal-config
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 584c4c8..9d18f5d 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -57,6 +57,7 @@ Summary: Core of Perl modules for %{name} package
Group: Applications/Internet
Provides: spacewalk(spacewalk-base-minimal) = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: spacewalk-base-minimal-config
Obsoletes: rhn-base-minimal < 5.3.0
Provides: rhn-base-minimal = 5.3.0
commit cf79690a814730651fa696f5f75117c821242074
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 28 13:30:39 2013 +0200
Revert "Fix javascript "Uncaught TypeError""
This reverts commit 5444ce5af42c3616ce0ee0ed3d2069541344f053.
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index 0231ac4..3062d83 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -183,7 +183,7 @@
--%>
<script language="javascript">
var items = document.getElementsByName('password-asterisk');
- if (document.getElementById('pam').checked == true) {
+ if (document.userCreateForm.usepam.checked == true) {
for (var i = 0; i < items.length; i++) {
items[i].style.display = "none";
}
commit 5444ce5af42c3616ce0ee0ed3d2069541344f053
Author: Johannes Renner <jrenner(a)suse.de>
Date: Tue Aug 27 12:19:48 2013 +0200
Fix javascript "Uncaught TypeError"
diff --git a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
index 3062d83..0231ac4 100644
--- a/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/create/usercreate.jsp
@@ -183,7 +183,7 @@
--%>
<script language="javascript">
var items = document.getElementsByName('password-asterisk');
- if (document.userCreateForm.usepam.checked == true) {
+ if (document.getElementById('pam').checked == true) {
for (var i = 0; i < items.length; i++) {
items[i].style.display = "none";
}
10 years, 8 months
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java | 5 +-
java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java | 18 ++++++++--
2 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 37cc54e56789baa8f8954195028bc2fad5f7eb44
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Aug 27 13:39:03 2013 +0200
1001551 - fix kickstart repositories selection
this was caused by 22f7bef1
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java
index 7666f35..c79ce03 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartEditCommand.java
@@ -38,8 +38,11 @@ import org.apache.log4j.Logger;
import java.util.Arrays;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -365,9 +368,18 @@ public class KickstartEditCommand extends BaseKickstartCommand {
*/
public void updateRepos(String[] reposIn) {
if (ksdata.isRhel5OrGreater()) {
-
- ksdata.setRepoInfos(RepoInfo.getStandardRepos(
- ksdata.getKickstartDefaults().getKstree()));
+ List<RepoInfo> repoList = RepoInfo.getStandardRepos(
+ ksdata.getKickstartDefaults().getKstree());
+ Map<String, RepoInfo> repoSet = new HashMap<String, RepoInfo>();
+ for (Iterator<RepoInfo> ri = repoList.iterator(); ri.hasNext();) {
+ RepoInfo rInfo = ri.next();
+ repoSet.put(rInfo.getName(), rInfo);
+ }
+ Set<RepoInfo> selected = new HashSet <RepoInfo>();
+ for (int i = 0; i < reposIn.length; i++) {
+ selected.add(repoSet.get(reposIn[i]));
+ }
+ ksdata.setRepoInfos(selected);
KickstartWizardHelper ksHelper = new KickstartWizardHelper(user);
ksHelper.processSkipKey(ksdata);
}
commit 3cb69e5c1f120c65395acfaefdd76284c9df7a59
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Aug 27 11:53:18 2013 +0200
998944 - fix package removal via ssm
elaboration was removed in 9b323f28
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
index e64aec6..438fd77 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
@@ -119,7 +119,7 @@ public class SchedulePackageRemoveAction extends RhnListAction implements Listab
* or a shortened much faster ones
* @return the List
*/
- public List<Map> getResult(RequestContext context, boolean shorten) {
+ public DataResult<Map> getResult(RequestContext context, boolean shorten) {
HttpServletRequest request = context.getRequest();
User user = context.getLoggedInUser();
@@ -170,7 +170,8 @@ public class SchedulePackageRemoveAction extends RhnListAction implements Listab
"date", DatePicker.YEAR_RANGE_POSITIVE);
// Parse through all of the results
- List<Map> result = getResult(context, true);
+ DataResult result = getResult(context, true);
+ result.elaborate();
log.debug("Publishing schedule package remove event to message queue.");
SsmRemovePackagesEvent event = new SsmRemovePackagesEvent(user.getId(), earliest,
10 years, 8 months
satellite/install
by Michael Mraka
satellite/install/install.pl | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
New commits:
commit 2eff315b98cfe83a88aa723bc2bdf7260de15243
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Aug 27 12:05:34 2013 +0200
510701 - made error message more descriptive
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 80debc6..198d663 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -161,13 +161,9 @@ sub do_precondition_checks {
if (not $opts->{"skip-system-version-test"}
and not correct_system_version($composeinfo, %version_info)) {
print loc(<<EOQ);
-This version of Red Hat Satellite runs only on:
- Red Hat Enterprise Linux 5 Server
- Red Hat Enterprise Linux 6 Server
Installation interrupted.
EOQ
-
exit 2;
}
@@ -229,12 +225,19 @@ sub correct_system_version {
my ($compose_version) = ($composeinfo->{treeName} =~ /(RHEL\d)/);
- return ($composeinfo->{treeArch} eq $version_info{arch}
- and (
- ($version_info{version} eq '5Server' and $compose_version eq 'RHEL5')
- or ($version_info{version} eq '6Server' and $compose_version eq 'RHEL6')
- )
- );
+ $version_info{version} =~ s/(\d)Server/Red Hat Enterprise Linux $1/;
+ $compose_version =~ s/RHEL/Red Hat Enterprise Linux /;
+
+ if ($composeinfo->{treeArch} eq $version_info{arch}
+ and $version_info{version} eq $compose_version
+ ) {
+ return 1;
+ }
+ print loc(<<EOH);
+ERROR: The installation media does not match your operating system:
+ $compose_version ($composeinfo->{treeArch}) vs. $version_info{version} ($version_info{arch})
+EOH
+ return 0;
}
sub getenforce {
@@ -871,7 +874,7 @@ sub get_composeinfo {
close(CINFO);
my $treeinfo_file = ".treeinfo";
- open(TINFO, $treeinfoinfo_file);
+ open(TINFO, $treeinfo_file);
foreach my $line (<TINFO>) {
chomp $line;
10 years, 8 months
2 commits - satellite/install
by Michael Mraka
satellite/install/install.pl | 44 +++++++++++++++++++++++++++++++++++--------
1 file changed, 36 insertions(+), 8 deletions(-)
New commits:
commit 61f29bcc5a2ffd982c5464ea235a6ce106bf5880
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri May 10 13:25:13 2013 +0200
510701 - compose arch is in .treeinfo
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 4acad56..80debc6 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -229,7 +229,7 @@ sub correct_system_version {
my ($compose_version) = ($composeinfo->{treeName} =~ /(RHEL\d)/);
- return ($composeinfo->{treeArch} =~ /$version_info{arch}/
+ return ($composeinfo->{treeArch} eq $version_info{arch}
and (
($version_info{version} eq '5Server' and $compose_version eq 'RHEL5')
or ($version_info{version} eq '6Server' and $compose_version eq 'RHEL6')
@@ -866,13 +866,22 @@ sub get_composeinfo {
if ($line =~ /^name\s*=\s*(.+)$/) {
$treeName = $1;
}
- if ($line =~ /^arches\s*=\s*(.+)$/) {
- $treeArch = $1;
- }
}
}
close(CINFO);
+ my $treeinfo_file = ".treeinfo";
+ open(TINFO, $treeinfoinfo_file);
+
+ foreach my $line (<TINFO>) {
+ chomp $line;
+
+ if ($line =~ /^arch\s*=\s*(.+)$/) {
+ $treeArch = $1;
+ }
+ }
+ close(TINFO);
+
if (defined $productVersion) { $productName .= " $productVersion"; }
if (defined $treeName) { $productName .= "\n($treeName)"; }
commit 68823274e7b775a33cd7f4c1cc7015e6ff31de85
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 9 13:39:15 2013 +0200
510701 - check compatibility of system and compose arch and version
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index a8cc4f8..4acad56 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -39,7 +39,8 @@ print loc("* Starting the Spacewalk installer.\n");
my $DEBUG;
$DEBUG = 0;
-Spacewalk::Setup::init_log_files(get_product_name(), @ARGV);
+my $composeinfo = get_composeinfo();
+Spacewalk::Setup::init_log_files($composeinfo->{productName}, @ARGV);
my %opts = Spacewalk::Setup::parse_options();
@@ -65,7 +66,7 @@ $answers{hostname} ||= Sys::Hostname::hostname;
my %version_info = get_version_info();
print loc("* Performing pre-install checks.\n");
-do_precondition_checks(\%opts, \%answers);
+do_precondition_checks(\%opts, \%answers, $composeinfo);
print loc("* Pre-install checks complete. Beginning installation.\n");
@@ -134,13 +135,14 @@ exec(SPACEWALK_SETUP_SCRIPT, @ARGV_ORIG, '--skip-logfile-init', @additionalOptio
sub get_version_info {
- my $vre = `rpm -q --queryformat '%{version} %{release} %{epoch}' --whatprovides redhat-release`;
- my ($version, $release, $epoch) = split /\s/, $vre;
+ my $vre = `rpm -q --queryformat '%{version} %{release} %{epoch} %{arch}' --whatprovides redhat-release`;
+ my ($version, $release, $epoch, $arch) = split /\s/, $vre;
my %version_info = (
version => $version,
release => $release,
epoch => $epoch,
+ arch => $arch,
);
return %version_info;
@@ -149,6 +151,7 @@ sub get_version_info {
sub do_precondition_checks {
my $opts = shift;
my $answers = shift;
+ my $composeinfo = shift;
if (umask() & ~022) {
print "The installer needs umask not to exceed 0022.\n";
@@ -156,7 +159,7 @@ sub do_precondition_checks {
}
if (not $opts->{"skip-system-version-test"}
- and not correct_system_version(%version_info)) {
+ and not correct_system_version($composeinfo, %version_info)) {
print loc(<<EOQ);
This version of Red Hat Satellite runs only on:
Red Hat Enterprise Linux 5 Server
@@ -221,9 +224,17 @@ EOH
}
sub correct_system_version {
+ my $composeinfo = shift;
my %version_info = @_;
- return 1 if grep { $version_info{version} eq $_ } qw/5Server 6Server/;
+ my ($compose_version) = ($composeinfo->{treeName} =~ /(RHEL\d)/);
+
+ return ($composeinfo->{treeArch} =~ /$version_info{arch}/
+ and (
+ ($version_info{version} eq '5Server' and $compose_version eq 'RHEL5')
+ or ($version_info{version} eq '6Server' and $compose_version eq 'RHEL6')
+ )
+ );
}
sub getenforce {
@@ -822,11 +833,12 @@ sub install_rhn_packages {
return 1;
}
-sub get_product_name {
+sub get_composeinfo {
my $composeinfo_file = ".composeinfo";
my $productName = "Red Hat Satellite", my $treeName;
my $productVersion;
my $productSection, my $treeSection;
+ my $treeArch;
open(CINFO, $composeinfo_file) || return $productName;
@@ -854,6 +866,9 @@ sub get_product_name {
if ($line =~ /^name\s*=\s*(.+)$/) {
$treeName = $1;
}
+ if ($line =~ /^arches\s*=\s*(.+)$/) {
+ $treeArch = $1;
+ }
}
}
close(CINFO);
@@ -861,7 +876,11 @@ sub get_product_name {
if (defined $productVersion) { $productName .= " $productVersion"; }
if (defined $treeName) { $productName .= "\n($treeName)"; }
- return "$productName";
+ return { productName => $productName,
+ productVersion => $productVersion,
+ treeName => $treeName,
+ treeArch => $treeArch,
+ };
}
10 years, 9 months
3 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java | 3 +--
java/code/src/com/redhat/rhn/frontend/events/SsmErrataEvent.java | 1 -
java/code/src/com/redhat/rhn/frontend/events/SsmSystemRebootEvent.java | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 77622c2a18450e1e1c614abc1ef4625333201eb2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 26 12:13:08 2013 +0200
removing @Override annotation from methods that aren't overriden
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmErrataEvent.java b/java/code/src/com/redhat/rhn/frontend/events/SsmErrataEvent.java
index a9b85de..599de52 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmErrataEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmErrataEvent.java
@@ -105,7 +105,6 @@ public class SsmErrataEvent implements EventMessage {
}
/** {@inheritDoc} */
- @Override
public String toText() {
return this.toString();
}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmSystemRebootEvent.java b/java/code/src/com/redhat/rhn/frontend/events/SsmSystemRebootEvent.java
index c0f085e..dedd76e 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmSystemRebootEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmSystemRebootEvent.java
@@ -102,7 +102,6 @@ public class SsmSystemRebootEvent implements EventMessage {
* Represent the object in ASCII text.
* @return String representation
*/
- @Override
public String toText() {
return this.toString();
}
commit 992e902eafa313d147c54e7c13813182deb1c6b9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 26 12:12:31 2013 +0200
removing @Override annotation from method that isn't overriden
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java
index 3712d4a..7140741 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java
@@ -160,7 +160,6 @@ public class ErrataListAction extends RhnAction implements Listable {
}
/** {@inheritDoc} */
- @Override
public List getResult(RequestContext context) {
List<SystemOverview> systems = null;
if (context.getRequest().getAttribute(ErrataListAction.MULTIBIND)
commit b446ad13034cc94e1e96225129126f80477b71cf
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 26 12:11:03 2013 +0200
remove unnecessary cast
diff --git a/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java b/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java
index eebc0dc..3712d4a 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/ssm/ErrataListAction.java
@@ -123,7 +123,7 @@ public class ErrataListAction extends RhnAction implements Listable {
this.getStrutsDelegate().saveMessages(request, actionMessages);
request.setAttribute("date", this.getStrutsDelegate().prepopulateDatePicker(
- request, (DynaActionForm) form, "date", DatePicker.YEAR_RANGE_POSITIVE));
+ request, form, "date", DatePicker.YEAR_RANGE_POSITIVE));
request.setAttribute("parentUrl", request.getRequestURI());
request.setAttribute(SELECTOR, request.getParameter(SELECTOR));
10 years, 9 months
Changes to 'refs/tags/spacecmd-2.1.6-1'
by aparsons
Tag 'spacecmd-2.1.6-1' created by Aron Parsons <aronparsons(a)gmail.com> at 2013-08-25 10:41 +0000
Tagging package [spacecmd] version [2.1.6-1] in directory [spacecmd/].
Changes since spacewalk-proxy-2.1.6-1:
Aron Parsons (3):
spacecmd: make the keys used in latest_pkg() configurable
spacecmd: remove duplicate packages in system_listupgrades output
Automatic commit of package [spacecmd] release [2.1.6-1].
---
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 6 +++++-
spacecmd/src/lib/system.py | 9 ++++++---
spacecmd/src/lib/utils.py | 7 ++++---
4 files changed, 16 insertions(+), 8 deletions(-)
---
10 years, 9 months
3 commits - rel-eng/packages spacecmd/spacecmd.spec spacecmd/src
by aparsons
rel-eng/packages/spacecmd | 2 +-
spacecmd/spacecmd.spec | 6 +++++-
spacecmd/src/lib/system.py | 9 ++++++---
spacecmd/src/lib/utils.py | 7 ++++---
4 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit 44c926e45fc656d6a37ef9ca6c5ba8b4abcbec69
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Sun Aug 25 06:41:46 2013 -0400
Automatic commit of package [spacecmd] release [2.1.6-1].
diff --git a/rel-eng/packages/spacecmd b/rel-eng/packages/spacecmd
index 3169c49..beb7484 100644
--- a/rel-eng/packages/spacecmd
+++ b/rel-eng/packages/spacecmd
@@ -1 +1 @@
-2.1.5-1 spacecmd/
+2.1.6-1 spacecmd/
diff --git a/spacecmd/spacecmd.spec b/spacecmd/spacecmd.spec
index d6466dc..480a7d2 100644
--- a/spacecmd/spacecmd.spec
+++ b/spacecmd/spacecmd.spec
@@ -4,7 +4,7 @@
%endif
Name: spacecmd
-Version: 2.1.5
+Version: 2.1.6
Release: 1%{?dist}
Summary: Command-line interface to Spacewalk and Satellite servers
@@ -64,6 +64,10 @@ touch %{buildroot}/%{python_sitelib}/spacecmd/__init__.py
%doc %{_mandir}/man1/spacecmd.1.gz
%changelog
+* Sun Aug 25 2013 Aron Parsons <aronparsons(a)gmail.com> 2.1.6-1
+- spacecmd: remove duplicate packages in system_listupgrades output
+- spacecmd: make the keys used in latest_pkg() configurable
+
* Wed Aug 21 2013 Dimitar Yordanov <dyordano(a)redhat.com> 2.1.5-1
- Add new function system_listcrashedsystems
commit e56a9a5d1e0e36bfffcde5f667ff3707c8af1acf
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Sun Aug 25 06:38:24 2013 -0400
spacecmd: remove duplicate packages in system_listupgrades output
diff --git a/spacecmd/src/lib/system.py b/spacecmd/src/lib/system.py
index 88ec973..91d5787 100644
--- a/spacecmd/src/lib/system.py
+++ b/spacecmd/src/lib/system.py
@@ -918,7 +918,9 @@ def do_system_listupgrades(self, args):
print system
print '-' * len(system)
- for package in sorted(packages, key=itemgetter('name')):
+ latest_packages = filter_latest_packages(packages, 'to_version', 'to_release', 'to_epoch')
+
+ for package in sorted(latest_packages.values(), key=itemgetter('name')):
# listLatestUpgradablePackages doesn't give us the arch,
# so use the package ID to get that information
print self.get_package_name(package.get('to_package_id'))
@@ -2721,7 +2723,8 @@ def do_system_syncpackages(self, args):
start_time)
####################
-def filter_latest_packages(pkglist):
+def filter_latest_packages(pkglist, version_key = 'version',
+ release_key = 'release', epoch_key = 'epoch'):
# Returns a dict, indexed by a compound (tuple) key based on
# arch and name, so we can store the latest version of each package
# for each arch. This approach avoids nested loops :)
@@ -2741,7 +2744,7 @@ def filter_latest_packages(pkglist):
latest[tuplekey] = p
else:
# Already have this package, is p newer?
- if p == latest_pkg(p, latest[tuplekey]):
+ if p == latest_pkg(p, latest[tuplekey], version_key, release_key, epoch_key):
latest[tuplekey] = p
return latest
commit d3388945ac67ec3a285139e861c937f996973883
Author: Aron Parsons <aronparsons(a)gmail.com>
Date: Sun Aug 25 06:37:57 2013 -0400
spacecmd: make the keys used in latest_pkg() configurable
diff --git a/spacecmd/src/lib/utils.py b/spacecmd/src/lib/utils.py
index 1e7aac9..a289cb2 100644
--- a/spacecmd/src/lib/utils.py
+++ b/spacecmd/src/lib/utils.py
@@ -301,11 +301,12 @@ def parse_time_input(userinput = ''):
# Compares 2 package objects (dicts) and returns the newest one.
# If the objects are the same, we return None
-def latest_pkg(pkg1, pkg2):
+def latest_pkg(pkg1, pkg2, version_key = 'version',
+ release_key = 'release', epoch_key = 'epoch'):
# Sometimes empty epoch is a space, sometimes its an empty string, which
# breaks the comparison, strip it here to fix
- t1 = (pkg1['epoch'].strip(), pkg1['version'], pkg1['release'])
- t2 = (pkg2['epoch'].strip(), pkg2['version'], pkg2['release'])
+ t1 = (pkg1[epoch_key].strip(), pkg1[version_key], pkg1[release_key])
+ t2 = (pkg2[epoch_key].strip(), pkg2[version_key], pkg2[release_key])
result = rpm.labelCompare(t1, t2)
if result == 1:
10 years, 9 months
Changes to 'refs/tags/spacewalk-proxy-2.1.6-1'
by StephenHerr
Tag 'spacewalk-proxy-2.1.6-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-08-23 20:32 +0000
Tagging package [spacewalk-proxy] version [2.1.6-1] in directory [proxy/proxy/].
Changes since spacewalk-proxy-2.1.5-1:
Stephen Herr (2):
1000586 - fixing line lenth error
Automatic commit of package [spacewalk-proxy] release [2.1.6-1].
---
proxy/proxy/broker/rhnBroker.py | 6 ++++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
---
10 years, 9 months
2 commits - proxy/proxy rel-eng/packages
by StephenHerr
proxy/proxy/broker/rhnBroker.py | 6 ++++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit a268c579de4a89e062a7a63884a07bb5b25db3c4
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 23 16:32:48 2013 -0400
Automatic commit of package [spacewalk-proxy] release [2.1.6-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 3fb3427..917657f 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.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: 2.1.5
+Version: 2.1.6
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -330,6 +330,9 @@ fi
%changelog
+* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.6-1
+- 1000586 - fixing line lenth error
+
* Fri Aug 23 2013 Stephen Herr <sherr(a)redhat.com> 2.1.5-1
- 1000586 - pylint errors
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 5c6d418..75f37fc 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-2.1.5-1 proxy/proxy/
+2.1.6-1 proxy/proxy/
commit 454960a2a3065b8b652ce06a12460c0dcbf4f975
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Aug 23 16:32:44 2013 -0400
1000586 - fixing line lenth error
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index 7477252..c480add 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -76,7 +76,8 @@ class BrokerHandler(SharedHandler):
# entry on the client or the hostname of some other
# machine (say a load balancer)) then use it
hostname = req.headers_in['Host']
- except (socket.gaierror, socket.error, socket.herror, socket.timeout):
+ except (socket.gaierror, socket.error,
+ socket.herror, socket.timeout):
# hostname probably didn't exist, fine
pass
if not hostname:
@@ -84,7 +85,8 @@ class BrokerHandler(SharedHandler):
# ip address
try:
hostname = socket.gethostbyaddr(my_ip_addr)[0]
- except (socket.gaierror, socket.error, socket.herror, socket.timeout):
+ except (socket.gaierror, socket.error,
+ socket.herror, socket.timeout):
# unknown host, we don't have a hostname?
pass
if not hostname:
10 years, 9 months
Changes to 'refs/tags/spacewalk-proxy-2.1.5-1'
by StephenHerr
Tag 'spacewalk-proxy-2.1.5-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-08-23 20:24 +0000
Tagging package [spacewalk-proxy] version [2.1.5-1] in directory [proxy/proxy/].
Changes since spacewalk-proxy-2.1.4-1:
Stephen Herr (2):
1000586 - pylint errors
Automatic commit of package [spacewalk-proxy] release [2.1.5-1].
---
proxy/proxy/broker/rhnBroker.py | 4 ++--
proxy/proxy/spacewalk-proxy.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
10 years, 9 months