rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/Server.pm | 32 +++++++++++++++++++++++++++-----
web/modules/rhn/RHN/Server.pm | 16 ++++++++--------
web/spacewalk-web.spec | 5 ++++-
4 files changed, 40 insertions(+), 15 deletions(-)
New commits:
commit 178f674f035557253c65e43e7b7fef482acea2f7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 23 14:36:30 2013 +0200
Automatic commit of package [spacewalk-web] release [2.1.27-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 58851b9..7d05402 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.26-1 web/
+2.1.27-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 176de76..4dbb812 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.26
+Version: 2.1.27
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk/
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -271,6 +271,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Wed Oct 23 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.27-1
+- report package arch in Event History
+
* Tue Oct 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1
- add support for enhances rpm weak dependency (web) (bnc#846436)
- 1020497 - provide a way to order kickstart scripts
commit b6430c1edf76b42219c689d1dd056e0f2cd1078e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Oct 23 13:59:39 2013 +0200
report package arch in Event History
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 91ca497..8d08737 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -600,15 +600,22 @@ sub server_event_package_action {
SELECT PN.name ||
CASE
WHEN PE.id IS NULL THEN ''
- ELSE '-' || evr_t_as_vre_simple(PE.evr) END
- AS NVRE,
+ ELSE '-' || evr_t_as_vre_simple(PE.evr) END ||
+ CASE
+ WHEN AP.package_arch_id is NULL THEN ''
+ ELSE '.' || ARCH.label END
+ AS NVREA,
AP.id AS ACTION_PACKAGE_ID,
PN.id || '|' || PE.id AS id_combo,
AP.package_arch_id
FROM rhnPackageName PN,
- rhnActionPackage AP LEFT OUTER JOIN
+ rhnActionPackage AP
+ LEFT OUTER JOIN
rhnPackageEVR PE
ON AP.evr_id = PE.id
+ LEFT OUTER JOIN
+ rhnPackageArch ARCH
+ ON ARCH.id = AP.package_arch_id
WHERE AP.action_id = :aid
AND AP.name_id = PN.id
EOS
@@ -664,13 +671,22 @@ sub server_event_delta_action {
my $dbh = RHN::DB->connect;
my $sth = $dbh->prepare(<<EOS);
-SELECT rTO.label AS OPERATION, PN.name AS NAME, PN.name || '-' ||
evr_t_as_vre_simple(PE.evr) AS NVRE
+SELECT rTO.label AS OPERATION,
+ PN.name AS NAME,
+ PN.name || '-' || evr_t_as_vre_simple(PE.evr) ||
+ CASE
+ WHEN TP.package_arch_id is NULL THEN ''
+ ELSE '.' || ARCH.label END
+ AS NVREA
FROM rhnPackageName PN,
rhnPackageEVR PE,
rhnTransactionOperation rTO,
rhnTransactionPackage TP,
rhnPackageDeltaElement PDE,
rhnActionPackageDelta APD
+ LEFT OUTER JOIN
+ rhnPackageArch ARCH
+ ON ARCH.id = TP.package_arch_id
WHERE APD.action_id = :aid
AND APD.package_delta_id = PDE.package_delta_id
AND PDE.transaction_package_id = TP.id
@@ -1859,7 +1875,10 @@ sub event_package_results {
SELECT SAPR.RESULT_CODE,
SAPR.STDOUT,
SAPR.STDERR,
- PN.name || CASE WHEN PE.id IS NULL THEN '' ELSE '-' ||
evr_t_as_vre_simple(PE.evr) END AS NVRE,
+ PN.name ||
+ CASE WHEN PE.id IS NULL THEN '' ELSE '-' ||
evr_t_as_vre_simple(PE.evr) END ||
+ CASE WHEN AP.package_arch_id is NULL THEN '' ELSE '.' ||
ARCH.label END
+ AS NVRE,
AP.id AS ACTION_PACKAGE_ID,
PN.id || '|' || PE.id AS ID_COMBO,
AP.package_arch_id,
@@ -1871,6 +1890,9 @@ SELECT SAPR.RESULT_CODE,
rhnPackageEVR PE,
rhnPackageName PN,
rhnActionPackage AP
+ LEFT OUTER JOIN
+ rhnPackageArch ARCH
+ ON ARCH.id = AP.package_arch_id
WHERE AP.action_id = :aid
AND AP.name_id = :name_id
AND AP.evr_id = :evr_id
diff --git a/web/modules/rhn/RHN/Server.pm b/web/modules/rhn/RHN/Server.pm
index 08fd5a8..990d8a0 100644
--- a/web/modules/rhn/RHN/Server.pm
+++ b/web/modules/rhn/RHN/Server.pm
@@ -300,7 +300,7 @@ sub render {
$ret->{server_event_details} .= qq{<div
class="action-summary-package">$package_name to be removed:<br
/><ul>\n};
for my $pkg (@{$self->{PACKAGES}}) {
- $ret->{server_event_details} .= qq{ <li
class="action-summary-package-nvre">$pkg->{NVRE}</li>\n};
+ $ret->{server_event_details} .= qq{ <li
class="action-summary-package-nvre">$pkg->{NVREA}</li>\n};
}
$ret->{server_event_details} .= qq{</ul></div>\n};
@@ -321,7 +321,7 @@ sub render {
$ret->{server_event_details} .= qq{<div
class="action-summary-package">Packages to be verified:<br
/><ul>\n};
for my $pkg (@{$self->{PACKAGES}}) {
- $ret->{server_event_details} .= qq{ <li
class="action-summary-package-nvre">$pkg->{NVRE}</li>\n};
+ $ret->{server_event_details} .= qq{ <li
class="action-summary-package-nvre">$pkg->{NVREA}</li>\n};
}
$ret->{server_event_details} .= qq{</ul></div>\n};
@@ -366,7 +366,7 @@ EOQ
$html .= "\n </li>";
- $ret->{server_event_details} .= sprintf($html, $pkg->{NVRE},
$self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO},
$pkg->{RESULTS}->{RESULT_CODE});
+ $ret->{server_event_details} .= sprintf($html, $pkg->{NVREA},
$self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO},
$pkg->{RESULTS}->{RESULT_CODE});
}
$ret->{server_event_details} .= qq{</ul></div>\n};
@@ -386,7 +386,7 @@ sub render {
$ret->{server_event_details} .= qq{<div
class="action-summary-package">Packages Scheduled:<br /><ul>\n};
for my $pkg (@{$self->{PACKAGES}}) {
- $ret->{server_event_details} .= qq{ <li
class="action-summary-package-nvre">$pkg->{NVRE}</li>\n};
+ $ret->{server_event_details} .= qq{ <li
class="action-summary-package-nvre">$pkg->{NVREA}</li>\n};
}
$ret->{server_event_details} .= qq{</ul></div>\n};
@@ -421,7 +421,7 @@ EOQ
$html .= "\n </li>";
- $ret->{server_event_details} .= sprintf($html, $pkg->{NVRE},
$self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO},
$pkg->{RESULTS}->{RESULT_CODE});
+ $ret->{server_event_details} .= sprintf($html, $pkg->{NVREA},
$self->{SERVER_ID}, $self->{ACTION_ID}, $pkg->{ID_COMBO},
$pkg->{RESULTS}->{RESULT_CODE});
}
$ret->{server_event_details} .= qq{</ul></div>\n};
@@ -449,7 +449,7 @@ sub render {
my @packages;
for my $pkg (@{$self->{PACKAGES}}) {
if ($packages[-1] and $packages[-1]->{NAME} eq $pkg->{NAME}) {
- $packages[-1]->{OTHER_NVRE} = $pkg->{NVRE};
+ $packages[-1]->{OTHER_NVREA} = $pkg->{NVREA};
$packages[-1]->{OPERATION} = 'replace';
}
else {
@@ -460,10 +460,10 @@ sub render {
for my $pkg (@packages) {
my $op = $operation_label_map{$pkg->{OPERATION}};
if ($pkg->{OPERATION} eq 'replace') {
- $ret->{server_event_details} .= qq{ <li
class="action-summary-package-nvre">$op $pkg->{NVRE} with
$pkg->{OTHER_NVRE}</li>\n};
+ $ret->{server_event_details} .= qq{ <li
class="action-summary-package-nvre">$op $pkg->{NVREA} with
$pkg->{OTHER_NVREA}</li>\n};
}
else {
- $ret->{server_event_details} .= qq{ <li
class="action-summary-package-nvre">$op $pkg->{NVRE}</li>\n};
+ $ret->{server_event_details} .= qq{ <li
class="action-summary-package-nvre">$op $pkg->{NVREA}</li>\n};
}
}
$ret->{server_event_details} .= qq{</ul></div>\n};