client/debian rel-eng/packages
by Jan Pazdziora
client/debian/packages-already-in-debian/apt-transport-spacewalk/apt-spacewalk.spec | 5 ++++-
rel-eng/packages/apt-spacewalk | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8284d05c3ba0e82b7bc194d0053acc075f522aa8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 6 17:05:38 2013 +0100
Automatic commit of package [apt-spacewalk] release [1.0.7-1].
diff --git a/client/debian/packages-already-in-debian/apt-transport-spacewalk/apt-spacewalk.spec b/client/debian/packages-already-in-debian/apt-transport-spacewalk/apt-spacewalk.spec
index 191c5c3..d8c304e 100644
--- a/client/debian/packages-already-in-debian/apt-transport-spacewalk/apt-spacewalk.spec
+++ b/client/debian/packages-already-in-debian/apt-transport-spacewalk/apt-spacewalk.spec
@@ -3,7 +3,7 @@
Name: apt-spacewalk
Summary: Spacewalk plugin for Advanced Packaging tool.
-Version: 1.0.6
+Version: 1.0.7
Release: 1%{?dist}
License: GPLv2
Source0: https://example.com/%{name}-%{version}.tar.gz
@@ -19,6 +19,9 @@ to acquire content from Spacewalk server
%files
%changelog
+* Wed Feb 06 2013 Jan Pazdziora 1.0.7-1
+- update documentation on Debian packages
+
* Sun Jun 17 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.0.6-1
- add copyright information to header of .py files
- ListRefresh is in APT:Update namespace
diff --git a/rel-eng/packages/apt-spacewalk b/rel-eng/packages/apt-spacewalk
index 00affc1..9d7b246 100644
--- a/rel-eng/packages/apt-spacewalk
+++ b/rel-eng/packages/apt-spacewalk
@@ -1 +1 @@
-1.0.6-1 client/debian/packages-already-in-debian/apt-transport-spacewalk/
+1.0.7-1 client/debian/packages-already-in-debian/apt-transport-spacewalk/
11 years, 3 months
rel-eng/packages
by Miroslav Suchý
rel-eng/packages/apt-spacewalk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0709c7611845fcf929ea3800aeac02366a22dddf
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Feb 6 17:00:20 2013 +0100
move location of apt-spacewalk as it was done in 0d53cc0
diff --git a/rel-eng/packages/apt-spacewalk b/rel-eng/packages/apt-spacewalk
index 820f5f8..00affc1 100644
--- a/rel-eng/packages/apt-spacewalk
+++ b/rel-eng/packages/apt-spacewalk
@@ -1 +1 @@
-1.0.6-1 client/debian/apt-spacewalk/src/
+1.0.6-1 client/debian/packages-already-in-debian/apt-transport-spacewalk/
11 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.9.60-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.60-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-02-06 15:51 +0000
Tagging package [spacewalk-java] version [1.9.60-1] in directory [java/].
Changes since rhn-virtualization-5.4.43-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.9.60-1].
---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 3 months
Changes to 'refs/tags/rhn-virtualization-5.4.43-1'
by Jan Pazdziora
Tag 'rhn-virtualization-5.4.43-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-02-06 15:51 +0000
Tagging package [rhn-virtualization] version [5.4.43-1] in directory [client/tools/rhn-virtualization/].
Changes since spacewalk-java-1.9.59-1:
Jan Pazdziora (1):
Automatic commit of package [rhn-virtualization] release [5.4.43-1].
Johannes Renner (1):
Make images of type 'kvm' show up on the UI
Michael Calmer (1):
support studio KVM image type
---
client/tools/rhn-virtualization/actions/image.py | 35 ++++++----
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 +
client/tools/rhn-virtualization/scripts/studio-kvm-template.xml | 2
java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java | 2
rel-eng/packages/rhn-virtualization | 2
5 files changed, 30 insertions(+), 16 deletions(-)
---
11 years, 3 months
2 commits - client/tools java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
client/tools/rhn-virtualization/rhn-virtualization.spec | 5 ++++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/rhn-virtualization | 2 +-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 206e01e1477c26f2ebaf9f6fec22a7e7f9a3b466
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 6 16:51:37 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.60-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 76add3d..32cb15d 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.9.59
+Version: 1.9.60
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Feb 06 2013 Jan Pazdziora 1.9.60-1
+- Make images of type 'kvm' show up on the UI
+
* Wed Feb 06 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.59-1
- 908346 - unify available package list for all systems
- 908346 - unify package list for all systems
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5c8639e..976bb1d 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.59-1 java/
+1.9.60-1 java/
commit d477b53ef5519251ea5dbd9fe77635ae3973df90
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Feb 6 16:51:32 2013 +0100
Automatic commit of package [rhn-virtualization] release [5.4.43-1].
diff --git a/client/tools/rhn-virtualization/rhn-virtualization.spec b/client/tools/rhn-virtualization/rhn-virtualization.spec
index a66a726..5e96f15 100644
--- a/client/tools/rhn-virtualization/rhn-virtualization.spec
+++ b/client/tools/rhn-virtualization/rhn-virtualization.spec
@@ -10,7 +10,7 @@ License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.4.42
+Version: 5.4.43
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -151,6 +151,9 @@ fi
%doc LICENSE
%changelog
+* Wed Feb 06 2013 Jan Pazdziora 5.4.43-1
+- support studio KVM image type
+
* Sun Nov 11 2012 Michael Calmer <mc(a)suse.de> 5.4.42-1
- no use of /var/lock/subsys/ anymore
diff --git a/rel-eng/packages/rhn-virtualization b/rel-eng/packages/rhn-virtualization
index fbae76f..9ac60af 100644
--- a/rel-eng/packages/rhn-virtualization
+++ b/rel-eng/packages/rhn-virtualization
@@ -1 +1 @@
-5.4.42-1 client/tools/rhn-virtualization/
+5.4.43-1 client/tools/rhn-virtualization/
11 years, 3 months
2 commits - client/tools java/code
by Jan Pazdziora
client/tools/rhn-virtualization/actions/image.py | 35 ++++++----
client/tools/rhn-virtualization/scripts/studio-kvm-template.xml | 2
java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java | 2
3 files changed, 25 insertions(+), 14 deletions(-)
New commits:
commit 03f3464b9949baf8702b629fc2fc9fcc09f523af
Author: Johannes Renner <jrenner(a)suse.de>
Date: Mon Jan 7 16:58:34 2013 +0100
Make images of type 'kvm' show up on the UI
diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java
index 45eb4e8..dea77e7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java
@@ -49,7 +49,7 @@ public class ImagesRenderer extends BaseFragmentRenderer {
public static final String ATTRIB_ERROR_MSG = "errorMsg";
// List of all valid image types
- private static List<String> validImageTypes = Arrays.asList("vmx", "xen");
+ private static List<String> validImageTypes = Arrays.asList("kvm", "vmx", "xen");
// The URL of the page to render
private static final String PAGE_URL =
commit d176ad856a85a39c834c47147c3c5f3206cb33eb
Author: Michael Calmer <mc(a)suse.de>
Date: Tue Jan 29 15:21:22 2013 +0100
support studio KVM image type
diff --git a/client/tools/rhn-virtualization/actions/image.py b/client/tools/rhn-virtualization/actions/image.py
index 4a81707..499acfc 100644
--- a/client/tools/rhn-virtualization/actions/image.py
+++ b/client/tools/rhn-virtualization/actions/image.py
@@ -7,10 +7,12 @@ import os
import pycurl
import re
import sys
+import shutil
sys.path.append("/usr/share/rhn/")
import virtualization.support as virt_support
from virtualization.util import generate_uuid
+from virtualization.errors import VirtualizationException
from up2date_client import up2dateLog
log = up2dateLog.initLog()
@@ -69,14 +71,14 @@ def _connect_to_hypervisor():
try:
import libvirt
except ImportError, ie:
- raise VirtLibNotFoundException, \
+ raise VirtualizationException, \
"Unable to locate libvirt: %s" % str(ie)
# Attempt to connect to the hypervisor.
try:
connection = libvirt.open(None)
except Exception, e:
- raise VirtualizationKickstartException, \
+ raise VirtualizationException, \
"Could not connect to hypervisor: %s" % str(e)
return connection
@@ -85,7 +87,7 @@ def _connect_to_hypervisor():
# this is not nice but tarfile.py does not support
# sparse file writing :(
#
-def _extractImage( source, dest ):
+def _extractImage( source, dest, imageType ):
param = "xf"
if not os.path.exists( source ):
log.log_debug("source file not found: %s" % source)
@@ -100,12 +102,16 @@ def _extractImage( source, dest ):
elif( source.endswith("bz2") ):
param = param + "j"
- # skip the root directory in the tar - extract only the image files
- cmd = "tar %s %s -C %s --strip-components=1" % ( param, source, dest )
- log.log_debug(cmd)
- if os.system( cmd ) != 0:
- log.log_debug( "%s failed" % cmd )
- raise Exception("%s failed" % cmd)
+ if imageType == 'qcow2':
+ log.log_debug(2, "copy %s to %s" %(source, dest))
+ shutil.copy2(source, dest)
+ else:
+ # skip the root directory in the tar - extract only the image files
+ cmd = "tar %s %s -C %s --strip-components=1" % ( param, source, dest )
+ log.log_debug(cmd)
+ if os.system( cmd ) != 0:
+ log.log_debug( "%s failed" % cmd )
+ raise Exception("%s failed" % cmd)
return 0
@@ -185,7 +191,7 @@ def deploy(params, extraParams="",cache_only=None):
# studioArchiveFileName = workshop_test_sles11sp1.i686-0.0.1.vmx.tar.gz
# studioArchiveFileName = Just_enough_OS_openSUSE_12.1.x86_64-0.0.1.xen.tar.gz
- m = re.search( '(.*)\.(x86_64|i\d86)-(\d+\.\d+\.\d+)\.(xen|vmx)', studioArchiveFileName )
+ m = re.search( '(.*)\.(x86_64|i\d86)-(\d+\.\d+\.\d+)\.(xen|vmx|qcow2)', studioArchiveFileName )
imageName = m.group(1)
imageArch = m.group(2)
@@ -193,7 +199,10 @@ def deploy(params, extraParams="",cache_only=None):
imageType = m.group(4)
studioImageDiskFileName = imageName+"."+imageArch+"-"+imageVersion
- connection = _connect_to_hypervisor()
+ try:
+ connection = _connect_to_hypervisor()
+ except Exception, e:
+ return (1, "%s" % e, {})
# if we got an explicit name, we'll use it
if params.has_key("domainName") and params["domainName"] != "":
@@ -225,7 +234,7 @@ def deploy(params, extraParams="",cache_only=None):
return (0, "image fetched and cached for later deployment", {})
try:
targetDir = _createTargetDir( "%s/%s" % (IMAGE_BASE_PATH, imageName) )
- _extractImage( "%s/%s" % (IMAGE_BASE_PATH,studioArchiveFileName), targetDir )
+ _extractImage( "%s/%s" % (IMAGE_BASE_PATH,studioArchiveFileName), targetDir, imageType )
except Exception, e:
return (1, "extracting the image tarball failed with: %s" % e, {})
@@ -236,6 +245,8 @@ def deploy(params, extraParams="",cache_only=None):
studioFileExtension = "vmdk"
if imageType == "xen":
studioFileExtension = "raw"
+ elif imageType == "qcow2":
+ studioFileExtension = "qcow2"
extractedImagePath = "%s/%s.%s" % (targetDir,studioImageDiskFileName,studioFileExtension)
log.log_debug("working on image in %s" % extractedImagePath)
if not os.path.exists( extractedImagePath ):
diff --git a/client/tools/rhn-virtualization/scripts/studio-kvm-template.xml b/client/tools/rhn-virtualization/scripts/studio-kvm-template.xml
index 42ac7dd..73d7797 100644
--- a/client/tools/rhn-virtualization/scripts/studio-kvm-template.xml
+++ b/client/tools/rhn-virtualization/scripts/studio-kvm-template.xml
@@ -14,7 +14,7 @@
<devices>
<emulator>/usr/bin/qemu-kvm</emulator>
<disk type='file' device='disk'>
- <driver name='qemu' type='vmdk'/>
+ <driver name='qemu' type='%(imageType)s'/>
<source file='%(disk)s'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' unit='0'/>
11 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.9.59-1'
by Tomas Lestach
Tag 'spacewalk-java-1.9.59-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-02-06 15:19 +0000
Tagging package [spacewalk-java] version [1.9.59-1] in directory [java/].
Changes since spacewalk-web-1.9.14-1:
Tomas Lestach (4):
908346 - unify upgradable package list for all systems
908346 - unify package list for all systems
908346 - unify available package list for all systems
Automatic commit of package [spacewalk-java] release [1.9.59-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 107 ----------
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java | 6
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java | 6
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java | 5
java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java | 31 --
java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java | 9
java/spacewalk-java.spec | 7
rel-eng/packages/spacewalk-java | 2
8 files changed, 13 insertions(+), 160 deletions(-)
---
11 years, 3 months
4 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 107 ----------
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java | 6
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java | 6
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java | 5
java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java | 31 --
java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java | 9
java/spacewalk-java.spec | 7
rel-eng/packages/spacewalk-java | 2
8 files changed, 13 insertions(+), 160 deletions(-)
New commits:
commit 42ac39fc3f2aa8e7bbf9f9b2f4b9544100d449ce
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Feb 6 16:19:05 2013 +0100
Automatic commit of package [spacewalk-java] release [1.9.59-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3919a07..76add3d 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.9.58
+Version: 1.9.59
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Feb 06 2013 Tomas Lestach <tlestach(a)redhat.com> 1.9.59-1
+- 908346 - unify available package list for all systems
+- 908346 - unify package list for all systems
+- 908346 - unify upgradable package list for all systems
+
* Tue Feb 05 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.58-1
- updated rhn-search path in messages
- added systemd service for taskomatic
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1e57625..5c8639e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.58-1 java/
+1.9.59-1 java/
commit fc85eb61b11b260f59191ef69de11c9f84c5bc58
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Feb 6 15:46:45 2013 +0100
908346 - unify available package list for all systems
fixes also duplicate packages issue on the systems/details/packages/InstallPackages.do page
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 0a9ea89..b204428 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -1097,32 +1097,6 @@ SELECT DISTINCT PN.name AS NAME,
</elaborator>
</mode>
-<mode name="system_available_solaris_package_list" class="com.redhat.rhn.frontend.dto.PackageListItem">
- <query params="sid">
-SELECT pn.name AS NAME,
- pn.name || '-' || evr_t_as_vre_simple(full_list.evr) AS NVRE,
- pn.id || '|' || lookup_evr((full_list.evr).epoch, (full_list.evr).version, (full_list.evr).release) AS ID_COMBO,
- pa.name as ARCH
- FROM (
- SELECT p.name_id name_id, max(pe.evr) evr
- FROM rhnPackageEVR PE, rhnPackage P,
- rhnChannelPackage CP, rhnServerChannel SC, rhnSolarisPackage SSP
- WHERE sc.server_id = :sid
- AND sc.channel_id = cp.channel_id
- AND cp.package_id = p.id
- AND ssp.package_id = p.id
- AND p.evr_id = pe.id
- GROUP BY p.name_id
- ) full_list,
- rhnPackageName pn
- INNER JOIN rhnPackage PKG ON pkg.name_id = pn.id
- INNER JOIN rhnPackageArch PA ON pa.id = pkg.package_arch_id
- WHERE full_list.name_id = pn.id
- AND full_list.name_id NOT IN (SELECT SP.name_id FROM rhnServerPackage SP WHERE SP.server_id = :sid)
-ORDER BY UPPER(pn.name)
- </query>
-</mode>
-
<mode name="system_available_solaris_patchset_list" class="com.redhat.rhn.frontend.dto.SolarisPatchSet">
<query params="sid">
SELECT P.id,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java
index 93523d7..9df6d9c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/InstallPackageSetupAction.java
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.action.rhnpackage;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
-import com.redhat.rhn.manager.solarispackage.SolarisManager;
/**
* InstallPackageSetupAction
@@ -30,9 +29,6 @@ public class InstallPackageSetupAction extends BaseSystemPackagesAction {
* @return List of packages that can be installed..
*/
protected DataResult getDataResult(Server server) {
- if (!server.isSolaris()) {
- return PackageManager.systemAvailablePackages(server.getId(), null);
- }
- return SolarisManager.systemAvailablePackageList(server.getId(), null);
+ return PackageManager.systemAvailablePackages(server.getId(), null);
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java b/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java
index 67bda3e..ab8f318 100644
--- a/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java
+++ b/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java
@@ -43,16 +43,6 @@ public class SolarisManager extends BaseManager {
}
/**
- * Returns list of available solaris package(s) for given server
- * @param sid Server Id
- * @param pc PageControl can also be null.
- * @return list of solaris packages for given server
- */
- public static DataResult systemAvailablePackageList(Long sid, PageControl pc) {
- return solarisPackageHelper(sid, pc, "system_available_solaris_package_list");
- }
-
- /**
* Returns list of installed solaris patch(es) for given server
* @param sid Server Id
* @param pc PageControl can also be null.
diff --git a/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java b/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java
index a9d3c21..e35489e 100644
--- a/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java
@@ -40,7 +40,7 @@ public class SolarisManagerTest extends RhnBaseTestCase {
pc.setStart(1);
// hard code for now.
- DataResult dr = SolarisManager.systemAvailablePackageList(new Long(1000010004), pc);
+ DataResult dr = PackageManager.systemAvailablePackages(new Long(1000010004), pc);
assertNotNull(dr);
}
commit dd2f36ddb47fc40ae16e43a44888e6048b82366c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Feb 6 15:42:30 2013 +0100
908346 - unify package list for all systems
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 03ad8ce..0a9ea89 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -1028,28 +1028,6 @@ ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
</query>
</mode>
-<mode name="system_solaris_package_list" class="com.redhat.rhn.frontend.dto.PackageListItem">
- <query params="sid">
-SELECT PN.id || '|' || PE.id AS ID_COMBO,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE,
- PN.name AS name,
- PE.version,
- PE.release,
- PE.epoch,
- PN.id AS NAME_ID,
- PE.id AS EVR_ID,
- PA.LABEL as arch
- FROM rhnServerPackage SP
- INNER JOIN rhnPackageName PN ON SP.name_id = PN.id
- INNER JOIN rhnPackageEVR PE ON SP.evr_id = PE.id
- INNER JOIN rhnPackageArch PA ON PA.id = SP.package_arch_id
- INNER JOIN rhnArchType AT ON AT.id = PA.arch_type_id
- WHERE SP.server_id = :sid
- AND AT.label = 'sysv-solaris'
-ORDER BY UPPER(PN.name), UPPER(evr_t_as_vre_simple(PE.evr))
- </query>
-</mode>
-
<mode name="system_available_patch_list" class="com.redhat.rhn.frontend.dto.PackageListItem">
<query params="sid">
SELECT pn.name AS NAME,
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java
index ec3ffff..6669c3c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageListSetupAction.java
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.action.rhnpackage;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
-import com.redhat.rhn.manager.solarispackage.SolarisManager;
/**
* PackageListSetupAction
@@ -30,9 +29,6 @@ public class PackageListSetupAction extends BaseSystemPackagesAction {
* @return List of installed packages
*/
protected DataResult getDataResult(Server server) {
- if (!server.isSolaris()) {
- return PackageManager.systemPackageList(server.getId(), null);
- }
- return SolarisManager.systemPackageList(server.getId(), null);
+ return PackageManager.systemPackageList(server.getId(), null);
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java b/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java
index 1d733a1..67bda3e 100644
--- a/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java
+++ b/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java
@@ -53,16 +53,6 @@ public class SolarisManager extends BaseManager {
}
/**
- * Returns list of installed solaris package(s) for given server
- * @param sid Server Id
- * @param pc PageControl can also be null.
- * @return list of solaris packages for given server
- */
- public static DataResult systemPackageList(Long sid, PageControl pc) {
- return solarisPackageHelper(sid, pc, "system_solaris_package_list");
- }
-
- /**
* Returns list of installed solaris patch(es) for given server
* @param sid Server Id
* @param pc PageControl can also be null.
diff --git a/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java b/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java
index 40695fd..a9d3c21 100644
--- a/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.manager.solarispackage.test;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.frontend.listview.PageControl;
+import com.redhat.rhn.manager.rhnpackage.PackageManager;
import com.redhat.rhn.manager.solarispackage.SolarisManager;
import com.redhat.rhn.testing.RhnBaseTestCase;
@@ -83,7 +84,7 @@ public class SolarisManagerTest extends RhnBaseTestCase {
pc.setStart(1);
// hard code for now.
- DataResult dr = SolarisManager.systemPackageList(new Long(1000010004), pc);
+ DataResult dr = PackageManager.systemPackageList(new Long(1000010004), pc);
assertNotNull(dr);
commit c3b4f9045dff6c1cdaa70a3ad205dec063781866
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Feb 6 14:31:08 2013 +0100
908346 - unify upgradable package list for all systems
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 9bd71c2..03ad8ce 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -1199,65 +1199,6 @@ SELECT 1
</query>
</mode>
-<mode name="system_upgradable_solaris_package_list" class="com.redhat.rhn.frontend.dto.UpgradablePackageListItem">
- <query params="sid">
-SELECT P.id AS id,
- PN.name AS name,
- pn.id || '|' || lookup_evr((full_list.evr).epoch, (full_list.evr).version, (full_list.evr).release) AS id_combo
- FROM rhnPackage P,
- rhnSolarisPackage SP,
- rhnPackageName PN,
- (
- SELECT SOP.package_name_id AS name_id, MAX(PE.evr) evr
- FROM rhnPackageEVR PE, rhnServerOutdatedPackages SOP
- WHERE SOP.server_id = :sid
- AND SOP.package_evr_id = PE.id
- GROUP BY SOP.package_name_id
- ) full_list
- WHERE full_list.name_id = PN.id
- AND PN.id = P.name_id
- AND P.evr_id = lookup_evr((full_list.evr).epoch, (full_list.evr).version, (full_list.evr).release)
- AND P.id = SP.package_id
-ORDER BY UPPER(PN.name)
- </query>
- <elaborator params="sid" multiple="t">
-SELECT P.id AS id,
- PN.id as name_id,
- pn.name ||'-'|| evr_t_as_vre_simple(full_list.evr) AS nvre,
- lookup_evr((full_list.evr).epoch, (full_list.evr).version, (full_list.evr).release) AS evr_id,
- PN.name || '-' || evr_t_as_vre_simple(SPE.evr) AS installed,
- full_list.server_id AS SERVER_ID,
- full_list.errata_id AS ERRATA_ID,
- full_list.errata_advisory AS ERRATA_ADVISORY,
- (full_list.evr).epoch AS EPOCH,
- (full_list.evr).version AS VERSION,
- (full_list.evr).release AS RELEASE,
- E.advisory_type AS ERRATA_ADVISORY_TYPE
- FROM rhnPackage P,
- rhnPackageName PN,
- rhnPackageEVR PE,
- rhnPackageEVR SPE,
- rhnServerPackage SP,
- (
- SELECT SOP.package_name_id name_id, MAX(peD.evr) evr,
- SOP.server_id server_id, SOP.errata_id errata_id,
- SOP.errata_advisory errata_advisory
- FROM rhnPackageEVR PED, rhnServerOutdatedPackages SOP
- WHERE SOP.server_id = :sid
- AND SOP.package_evr_id = PED.id
- GROUP BY SOP.package_name_id, SOP.server_id, SOP.errata_id, SOP.errata_advisory
- ) full_list LEFT OUTER JOIN rhnErrata E on full_list.errata_id = E.id
- WHERE P.id IN (%s)
- AND P.name_id = PN.id
- AND PN.id = full_list.name_id
- AND PE.id = lookup_evr((full_list.evr).epoch, (full_list.evr).version, (full_list.evr).release)
- AND SP.name_id = PN.id
- AND SP.server_id = :sid
- AND SPE.id = SP.evr_id
- AND SPE.evr < PE.evr
- </elaborator>
-</mode>
-
<mode name="all_packages_in_channel_after" class="com.redhat.rhn.frontend.dto.PackageDto">
<query params="cid, start_date_str">
SELECT
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java
index f885847..57b40a3 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/UpgradableListSetupAction.java
@@ -17,7 +17,6 @@ package com.redhat.rhn.frontend.action.rhnpackage;
import com.redhat.rhn.common.db.datasource.DataResult;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.manager.rhnpackage.PackageManager;
-import com.redhat.rhn.manager.solarispackage.SolarisManager;
/**
* UpgradableListSetupAction
@@ -26,10 +25,6 @@ import com.redhat.rhn.manager.solarispackage.SolarisManager;
public class UpgradableListSetupAction extends BaseSystemPackagesAction {
@Override
protected DataResult getDataResult(Server server) {
- if (!server.isSolaris()) {
return PackageManager.upgradable(server.getId(), null);
- }
- return SolarisManager.systemUpgradablePackageList(server.getId(), null);
}
-
}
diff --git a/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java b/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java
index f2bd6fc..1d733a1 100644
--- a/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java
+++ b/java/code/src/com/redhat/rhn/manager/solarispackage/SolarisManager.java
@@ -20,7 +20,6 @@ import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.manager.BaseManager;
-
import java.util.HashMap;
import java.util.Map;
@@ -54,16 +53,6 @@ public class SolarisManager extends BaseManager {
}
/**
- * Returns list of upgradable solaris package(s) for given server
- * @param sid Server Id
- * @param pc PageControl can also be null.
- * @return list of solaris packages for given server
- */
- public static DataResult systemUpgradablePackageList(Long sid, PageControl pc) {
- return solarisPackageHelper(sid, pc, "system_upgradable_solaris_package_list");
- }
-
- /**
* Returns list of installed solaris package(s) for given server
* @param sid Server Id
* @param pc PageControl can also be null.
diff --git a/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java b/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java
index ea713cd..40695fd 100644
--- a/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java
+++ b/java/code/src/com/redhat/rhn/manager/solarispackage/test/SolarisManagerTest.java
@@ -50,10 +50,8 @@ public class SolarisManagerTest extends RhnBaseTestCase {
pc.setStart(1);
// hard code for now.
- DataResult dr = SolarisManager.
- systemUpgradablePackageList(new Long(1000010004), pc);
+ DataResult dr = PackageManager.upgradable(new Long(1000010004), pc);
assertNotNull(dr);
-
}
public void atestSystemAvailablePatchList() {
11 years, 3 months
Changes to 'refs/tags/spacewalk-web-1.9.14-1'
by StephenHerr
Tag 'spacewalk-web-1.9.14-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-02-06 13:36 +0000
Tagging package [spacewalk-web] version [1.9.14-1] in directory [web/].
Changes since rhncfg-5.10.42-1:
Stephen Herr (1):
Automatic commit of package [spacewalk-web] release [1.9.14-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 3 months
rel-eng/packages web/spacewalk-web.spec
by StephenHerr
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 68a21705055f4d39e39db904c26f2bbaef9c0f1d
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Feb 6 08:36:52 2013 -0500
Automatic commit of package [spacewalk-web] release [1.9.14-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index c4fc232..c2243af 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.9.13-1 web/
+1.9.14-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 2188cb7..54e90e0 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.9.13
+Version: 1.9.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Feb 06 2013 Stephen Herr <sherr(a)redhat.com> 1.9.14-1
+- Make it possible to run db-control without doing su - oracle first.
+
* Tue Feb 05 2013 Jan Pazdziora 1.9.13-1
- Removing hw_prof_update_conf.pxt, pkg_prof_update_conf.pxt, and
rhn:server_set_actions_cb as they have been replaced by .do pages.
11 years, 3 months