3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Dobes
java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java | 11 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 ++
java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp | 2 -
java/spacewalk-java.spec | 6 ++++-
rel-eng/packages/spacewalk-java | 2 -
5 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 25712cdd79b840ae6a2d0cb80ed0ab254d984169
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jun 11 18:53:13 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.92-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b694e85..126b101 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.91
+Version: 1.10.92
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jun 11 2013 Jan Dobes 1.10.92-1
+- 970125 - adding unique value check
+- 971828 - fixing wrong escaping of utf-8 strings
+
* Tue Jun 11 2013 Jan Dobes 1.10.91-1
- 913032 - we now remember sent errata email notifications to prevent multiple
messages
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b9ecb1f..b84f363 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.91-1 java/
+1.10.92-1 java/
commit 0116589c7658c34de44ca019a7c40af3c068b378
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jun 11 18:23:41 2013 +0200
970125 - adding unique value check
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java
index 941ce7a..fc866cc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java
@@ -112,6 +112,17 @@ public class DistChannelMapEditAction extends RhnAction {
if (dcmId == null || dcm == null || dcm.getOrg() == null) {
ChannelArch cha = ChannelFactory.lookupArchByLabel(
(String) form.get(CHANNEL_ARCH));
+
+ // Combination org, release, architecture has to be unique.
+ dcm = ChannelFactory.lookupDistChannelMapByOrgReleaseArch(
+ user.getOrg(), (String) form.get(RELEASE), cha);
+ if (dcm != null) {
+ createErrorMessage(request,
+ "distchannelmap.jsp.create.default.message",
+ (String) form.get(OS));
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
DistChannelMap newDcm = new DistChannelMap(
user.getOrg(), (String) form.get(OS), (String) form.get(RELEASE),
cha, channel);
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index a459254..300f836 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -8116,6 +8116,9 @@ Please note that some manual configuration of these scripts may still be require
<trans-unit id="distchannelmap.jsp.create.message">
<source>New Distribution Channel Mapping '{0}' created successfully.</source>
</trans-unit>
+ <trans-unit id="distchannelmap.jsp.create.default.message">
+ <source>New Distribution Channel Mapping '{0}' cannot be created. Release - Architecture combination already exists.</source>
+ </trans-unit>
<trans-unit id="distchannelmap.jsp.update.message">
<source>Distribution Channel Mapping '{0}' updated successfully.</source>
</trans-unit>
commit df7ef7cedff6651c3c5f3ba3ca456a599fdd1e3d
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jun 11 14:36:18 2013 +0200
971828 - fixing wrong escaping of utf-8 strings
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
index 62318d9..8621e3d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
@@ -78,7 +78,7 @@
sortable="false"
headerkey="realname.displayname"
attr="userLastName">
- <c:out value="${current.userDisplayName}" />
+ <c:out value="${current.userDisplayName}" escapeXml="false" />
</rl:column>
<rl:column bound="false"
sortable="false"
10 years, 10 months
Changes to 'refs/tags/spacewalk-reports-1.10.10-1'
by Tomáš Kašpárek
Tag 'spacewalk-reports-1.10.10-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-11 11:27 +0000
Tagging package [spacewalk-reports] version [1.10.10-1] in directory [reporting/].
Changes since spacewalk-java-1.10.91-1:
Tomas Kasparek (2):
963754 - inventory report should now display correct number of errata
Automatic commit of package [spacewalk-reports] release [1.10.10-1].
---
rel-eng/packages/spacewalk-reports | 2 +-
reporting/reports/data/inventory | 2 +-
reporting/spacewalk-reports.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 10 months
rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 1b314d05d644b126d82a76a73feaf142c9240481
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 11 13:27:26 2013 +0200
Automatic commit of package [spacewalk-reports] release [1.10.10-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index 55fddc9..bbe0027 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.10.9-1 reporting/
+1.10.10-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index a6abcf9..c224759 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 1.10.9
+Version: 1.10.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Tue Jun 11 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.10-1
+- 963754 - inventory report should now display correct number of errata
+
* Tue Jun 11 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.9-1
- typo fix
- 768074 - performance fix for spacewalk-report
10 years, 10 months
reporting/reports
by Tomáš Kašpárek
reporting/reports/data/inventory | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 794500f707bddf9c29675ca4ad54cf91bed1c367
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 11 13:24:31 2013 +0200
963754 - inventory report should now display correct number of errata
diff --git a/reporting/reports/data/inventory b/reporting/reports/data/inventory
index 6ec3185..09d54fa 100644
--- a/reporting/reports/data/inventory
+++ b/reporting/reports/data/inventory
@@ -59,7 +59,7 @@ sql:
( select count(distinct rhnpackage.name_id) from rhnpackage, rhnserverneededpackagecache
where rhnserver.id = rhnserverneededpackagecache.server_id
and rhnserverneededpackagecache.package_id = rhnpackage.id ) as packages_out_of_date,
- ( select count(*) from rhnServerNeededErrataCache where rhnserver.id = server_id ) as errata_out_of_date,
+ ( select count(*) from rhnServerNeededErrataCache where rhnserver.id = server_id and errata_id is not null) as errata_out_of_date,
rhnchannel.name as software_channel,
rhnchannel.parent_channel as parent_channel,
rhnchannel.id as channel_id,
10 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.10.91-1'
by Jan Dobes
Tag 'spacewalk-java-1.10.91-1' created by Jan Dobes <jdobes(a)redhat.com> at 2013-06-11 09:56 +0000
Tagging package [spacewalk-java] version [1.10.91-1] in directory [java/].
Changes since spacewalk-reports-1.10.9-1:
Jan Dobes (2):
913032 - we now remember sent errata email notifications to prevent multiple messages
Automatic commit of package [spacewalk-java] release [1.10.91-1].
---
java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java | 12 ----------
java/spacewalk-java.spec | 6 ++++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 6 insertions(+), 14 deletions(-)
---
10 years, 10 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Jan Dobes
java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java | 12 ----------
java/spacewalk-java.spec | 6 ++++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 6 insertions(+), 14 deletions(-)
New commits:
commit 4460fb587b0a39da18411625e13cd24fc5de08ce
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jun 11 11:56:35 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.91-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ca2b02b..b694e85 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.90
+Version: 1.10.91
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jun 11 2013 Jan Dobes 1.10.91-1
+- 913032 - we now remember sent errata email notifications to prevent multiple
+ messages
+
* Mon Jun 10 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.90-1
- software crashes menu should be visible only for management entitled orgs
- 871276 - page for physical systems
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 81a8342..b9ecb1f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.90-1 java/
+1.10.91-1 java/
commit 178fe375889d714781f61e08fc7f837db5978f5a
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Wed Jun 5 18:17:58 2013 +0200
913032 - we now remember sent errata email notifications to prevent multiple messages
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
index 24c3093..d6168b8 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/errata/ErrataQueueWorker.java
@@ -88,18 +88,6 @@ class ErrataQueueWorker implements QueueWorker {
errataId.longValue());
}
- WriteMode deqNotif = ModeFactory.getWriteMode(TaskConstants.MODE_NAME,
- TaskConstants.TASK_QUERY_ERRATA_QUEUE_DEQUEUE_ERRATA_NOTIFICATION);
- Map deqNotifParams = new HashMap();
- deqNotifParams.put("errata_id", errataId);
- deqNotifParams.put("channel_id", channelId);
- deqNotifParams.put("org_id", orgId);
- int notifDeleted = deqNotif.executeUpdate(deqNotifParams);
- if (logger.isDebugEnabled()) {
- logger.debug("deleted " + notifDeleted +
- " rows from the rhnErrataNotificationQueue table");
- }
-
WriteMode marker = ModeFactory.getWriteMode(TaskConstants.MODE_NAME,
TaskConstants.TASK_QUERY_ERRATA_QUEUE_ENQUEUE_SAT_ERRATA);
Map params = new HashMap();
10 years, 10 months
Changes to 'refs/tags/spacewalk-reports-1.10.9-1'
by Tomáš Kašpárek
Tag 'spacewalk-reports-1.10.9-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-11 09:26 +0000
Tagging package [spacewalk-reports] version [1.10.9-1] in directory [reporting/].
Changes since spacewalk-web-1.10.26-1:
Tomas Kasparek (3):
768074 - performance fix for spacewalk-report
typo fix
Automatic commit of package [spacewalk-reports] release [1.10.9-1].
---
rel-eng/packages/spacewalk-reports | 2
reporting/reports/data/packages-updates-all | 43 +++++++----------
reporting/reports/data/packages-updates-newest | 63 ++++++++++---------------
reporting/reports/data/system-groups-users | 2
reporting/spacewalk-reports.spec | 6 +-
5 files changed, 52 insertions(+), 64 deletions(-)
---
10 years, 10 months
3 commits - rel-eng/packages reporting/reports reporting/spacewalk-reports.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-reports | 2
reporting/reports/data/packages-updates-all | 43 +++++++----------
reporting/reports/data/packages-updates-newest | 63 ++++++++++---------------
reporting/reports/data/system-groups-users | 2
reporting/spacewalk-reports.spec | 6 +-
5 files changed, 52 insertions(+), 64 deletions(-)
New commits:
commit be6b38c118aee3db0bfb0bd95d26e800f6cfe3c7
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 11 11:26:07 2013 +0200
Automatic commit of package [spacewalk-reports] release [1.10.9-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index 2847836..55fddc9 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-1.10.8-1 reporting/
+1.10.9-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index 546ddf8..a6abcf9 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 1.10.8
+Version: 1.10.9
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Tue Jun 11 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.9-1
+- typo fix
+- 768074 - performance fix for spacewalk-report
+
* Wed Jun 05 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.8-1
- 477631 - fix of system group reports
commit ea92f6616107901b77f8748b2a5d8cff1b47b4dd
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 11 11:25:24 2013 +0200
typo fix
diff --git a/reporting/reports/data/system-groups-users b/reporting/reports/data/system-groups-users
index 54ca731..6f6f6e2 100644
--- a/reporting/reports/data/system-groups-users
+++ b/reporting/reports/data/system-groups-users
@@ -5,7 +5,7 @@ synopsis:
description:
- List of users which can access specefic system groups
+ List of users which can access specific system groups
columns:
commit 0a603cc16c3547e316629bcfc3616f99b8b8e808
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 11 11:19:49 2013 +0200
768074 - performance fix for spacewalk-report
reports packages-updates-all and packages-updates-newest were slow on large DBs
this should fix it
diff --git a/reporting/reports/data/packages-updates-all b/reporting/reports/data/packages-updates-all
index e86d491..b718f2c 100644
--- a/reporting/reports/data/packages-updates-all
+++ b/reporting/reports/data/packages-updates-all
@@ -23,31 +23,24 @@ columns:
sql:
select * from (
- select RS.id as system_id,
- RS.org_id as org_id,
- RPN.name as package_name,
- RPE.epoch as package_epoch,
- RPE.version as package_version,
- RPE.release as package_release,
- RPA.label as package_arch,
- RPE1.epoch as newer_epoch,
- RPE1.version as newer_version,
- RPE1.release as newer_release
- from rhnServer RS
- join rhnServerPackage RSP on RS.id=RSP.server_id
- join rhnPackageName RPN on RSP.name_id=RPN.id
- join rhnPackageEvr RPE on RSP.evr_id=RPE.id
- join rhnPackageArch RPA on RSP.package_arch_id=RPA.id,
- rhnServer RS1
- join rhnServerChannel RSC on RS1.id=RSC.server_id
- join rhnChannelPackage RCP on RSC.channel_id=RCP.channel_id
- join rhnPackage RP on RCP.package_id=RP.id
- join rhnPackageName RPN1 on RP.name_id=RPN1.id
- join rhnPackageEvr RPE1 on RP.evr_id=RPE1.id
- join rhnPackageArch RPA1 on RP.package_arch_id=RPA1.id
- where RS.id=RS1.id
- and RPN.name=RPN1.name
- and RPE.evr < RPE1.evr
+ select S.id as system_id,
+ S.org_id as org_id,
+ PN.name as package_name,
+ OPE.epoch as package_epoch,
+ OPE.version as package_version,
+ OPE.release as package_release,
+ PA.label as package_arch,
+ NPE.epoch as newer_epoch,
+ NPE.version as newer_version,
+ NPE.release as newer_release
+ from rhnServer S
+ join rhnServerNeededPackageCache SPC on S.id=SPC.server_id
+ join rhnPackage P on SPC.package_id=P.id
+ join rhnPackageName PN on P.name_id=PN.id
+ join rhnServerPackage SP on SP.server_id=S.id and SP.name_id=P.name_id
+ join rhnPackageArch PA on SP.package_arch_id=PA.id
+ join rhnPackageEvr OPE on OPE.id=SP.evr_id
+ join rhnPackageEvr NPE on NPE.id=P.evr_id
) X
-- where placeholder
order by org_id, system_id
diff --git a/reporting/reports/data/packages-updates-newest b/reporting/reports/data/packages-updates-newest
index 92dc0d0..abbe6c6 100644
--- a/reporting/reports/data/packages-updates-newest
+++ b/reporting/reports/data/packages-updates-newest
@@ -23,39 +23,30 @@ columns:
sql:
select * from (
- select RS.id as system_id,
- RS.org_id as org_id,
- RPN.name as package_name,
- RPE.epoch as package_epoch,
- RPE.version as package_version,
- RPE.release as package_release,
- RPA.label as package_arch,
- RPE1.epoch as newest_epoch,
- RPE1.version as newest_version,
- RPE1.release as newest_release
- from rhnServer RS
- join rhnServerPackage RSP on RS.id=RSP.server_id
- join rhnPackageName RPN on RSP.name_id=RPN.id
- join rhnPackageEvr RPE on RSP.evr_id=RPE.id
- join rhnPackageArch RPA on RSP.package_arch_id=RPA.id,
- rhnServer RS1
- join rhnServerChannel RSC on RS1.id=RSC.server_id
- join rhnChannelPackage RCP on RSC.channel_id=RCP.channel_id
- join rhnPackage RP on RCP.package_id=RP.id
- join rhnPackageName RPN1 on RP.name_id=RPN1.id
- join rhnPackageEvr RPE1 on RP.evr_id=RPE1.id
- join rhnPackageArch RPA1 on RP.package_arch_id=RPA1.id
- where RS.id=RS1.id
- and RPN.name=RPN1.name
- and RPE.evr < RPE1.evr
- and RPE1.evr = (
- select max(RPE2.evr)
- from rhnPackage RP1
- join rhnPackageName RPN2 on RP1.name_id=RPN2.id
- join rhnPackageEvr RPE2 on RP1.evr_id=RPE2.id
- where RPN.name=RPN2.name
- )
- ) X
- -- where placeholder
- order by org_id, system_id
-
+ select S.id as system_id,
+ S.org_id as org_id,
+ PN.name as package_name,
+ OPE.epoch as package_epoch,
+ OPE.version as package_version,
+ OPE.release as package_release,
+ PA.label as package_arch,
+ NPE.epoch as newest_epoch,
+ NPE.version as newest_version,
+ NPE.release as newest_release
+ from rhnServer S
+ join rhnServerNeededPackageCache SPC on S.id=SPC.server_id
+ join rhnPackage P on SPC.package_id=P.id
+ join rhnPackageName PN on P.name_id=PN.id
+ join rhnServerPackage SP on SP.server_id=S.id and SP.name_id=P.name_id
+ join rhnPackageArch PA on SP.package_arch_id=PA.id
+ join rhnPackageEvr OPE on OPE.id=SP.evr_id
+ join rhnPackageEvr NPE on NPE.id=P.evr_id
+ where NPE.evr=(
+ select max(PE.evr)
+ from rhnServerNeededPackageCache SPC1
+ join rhnPackage P1 on SPC1.package_id=P1.id
+ join rhnPackageEvr PE on P1.evr_id=PE.id
+ where P1.name_id=P.name_id)
+ ) X
+ -- where placeholder
+ order by org_id, system_id
10 years, 10 months
Changes to 'refs/tags/spacewalk-web-1.10.26-1'
by Michael Mraka
Tag 'spacewalk-web-1.10.26-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-06-10 12:19 +0000
Tagging package [spacewalk-web] version [1.10.26-1] in directory [web/].
Changes since spacewalk-java-1.10.90-1:
Michael Mraka (2):
970146 - fix db-control examine and verify for online backups
Automatic commit of package [spacewalk-web] release [1.10.26-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 11 +++++++++++
web/spacewalk-web.spec | 5 ++++-
3 files changed, 16 insertions(+), 2 deletions(-)
---
10 years, 10 months
2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 11 +++++++++++
web/spacewalk-web.spec | 5 ++++-
3 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit bc4c46e53b01635a3f703834ec8f8b0ccadfaf9c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jun 10 14:19:21 2013 +0200
Automatic commit of package [spacewalk-web] release [1.10.26-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 5d3da33..24b6c3c 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.10.25-1 web/
+1.10.26-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 4f9cb5b..410a628 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: 1.10.25
+Version: 1.10.26
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -272,6 +272,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Jun 10 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.26-1
+- 970146 - fix db-control examine and verify for online backups
+
* Wed Jun 05 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.25-1
- spacewalk-dobby: remove dependency on apache, spacewalk-base, spacewalk-setup
- Move RHN::SimpleStruct from spacewalk-base to spacewalk-base-minimal
commit 1879108ffc92e3f9e4847589556b2e2aaf49f433
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jun 10 14:04:03 2013 +0200
970146 - fix db-control examine and verify for online backups
diff --git a/web/modules/dobby/Dobby/CLI/BackupCommands.pm b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
index abc31b4..3e852e1 100644
--- a/web/modules/dobby/Dobby/CLI/BackupCommands.pm
+++ b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
@@ -349,6 +349,17 @@ sub command_pg_restore {
my $backend = PXT::Config->get('db_backend');
$cli->fatal("Error: This backup method works only with PostgreSQL.") unless ($backend eq 'postgresql');
+
+ if ($command eq 'examine') {
+ my @info = qx{/usr/bin/pg_restore -l $file};
+ @info = grep {m/^; /} @info;
+ print @info;
+ return $?;
+ } elsif ($command eq 'verify') {
+ $cli->fatal("Error: Backup verification is available only for cold backups.");
+ return 1;
+ }
+
my $cfg = new PXT::Config("dobby");
my @rec = getpwnam($cfg->get("postgresql_user"));
$EUID = $rec[2];
10 years, 10 months