java/code
by Joshua Roys
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 41 +++++++++-
java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java | 32 +++++++
2 files changed, 69 insertions(+), 4 deletions(-)
New commits:
commit 3858b5b578f513f13315f75ad60ffc7a341a857b
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Tue Mar 9 19:41:17 2010 +0000
Add an API function: errata.listUnpublishedErrata
This will list unpublished errata for the logged-in user's org.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index a58aa36..98fc044 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -537,7 +537,46 @@ public class ErrataHandler extends BaseHandler {
return ErrataManager.applicableChannels(errata.getId(),
loggedInUser.getOrg().getId(), null, Map.class).toArray();
}
-
+
+ /**
+ * Returns a list of unpublished errata for the logged-in user's Org.
+ * @param sessionKey The sessionKey for the logged in user
+ * @return Returns an array of errata
+ *
+ * @xmlrpc.doc Returns a list of unpublished errata
+ * @xmlrpc.param #session_key()
+ * @xmlrpc.returntype
+ * #array()
+ * #struct()
+ * #prop("int", "id")
+ * #prop("int", "published")
+ * #prop("string", "advisory")
+ * #prop("string", "advisory_name")
+ * #prop("string", "advisory_type")
+ * #prop("string", "synopsis")
+ * #prop("dateTime.iso8601", "created")
+ * #prop("dateTime.iso8601", "update_date")
+ * #struct_end()
+ * #array_end()
+ */
+ public Object[] listUnpublishedErrata(String sessionKey) {
+ User loggedInUser = getLoggedInUser(sessionKey);
+ Map[] unpub = (Map[])ErrataManager.unpublishedOwnedErrata(loggedInUser, Map.class)
+ .toArray(new Map[0]);
+
+ for (Map errataItem : unpub) {
+ // remove items that can be NULL to prevent xmlrpc failure
+ Iterator<Map.Entry> itr = errataItem.entrySet().iterator();
+ for (; itr.hasNext();) {
+ if (itr.next().getValue() == null) {
+ itr.remove();
+ }
+ }
+ }
+
+ return unpub;
+ }
+
/**
* Returns a list of CVEs for a given erratum
* @param sessionKey The sessionKey for the logged in user
diff --git a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
index f2411f3..a7ebfde 100644
--- a/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
+++ b/java/code/src/com/redhat/rhn/manager/errata/ErrataManager.java
@@ -415,7 +415,17 @@ public class ErrataManager extends BaseManager {
* @return all of the errata.
*/
public static DataResult unpublishedOwnedErrata(User user) {
- return ownedErrata(user, "unpublished_owned_errata");
+ return unpublishedOwnedErrata(user, null);
+ }
+
+ /**
+ * Returns all of the unpublished errata.
+ * @param user Currently logged in user.
+ * @param clazz The class you would like the return values represented as
+ * @return all of the errata.
+ */
+ public static DataResult unpublishedOwnedErrata(User user, Class clazz) {
+ return ownedErrata(user, "unpublished_owned_errata", clazz);
}
/**
@@ -476,7 +486,6 @@ public class ErrataManager extends BaseManager {
return dr;
}
-
/**
* Helper method to get the unpublished/published errata
* @param user Currently logged in user
@@ -484,7 +493,24 @@ public class ErrataManager extends BaseManager {
* @return all of the errata
*/
private static DataResult ownedErrata(User user, String mode) {
- SelectMode m = ModeFactory.getMode("Errata_queries", mode);
+ return ownedErrata(user, mode, null);
+ }
+
+ /**
+ * Helper method to get the unpublished/published errata
+ * @param user Currently logged in user
+ * @param mode Tells which mode (published/unpublished) we need to run
+ * @param clazz The class you would like the return values represented as
+ * @return all of the errata
+ */
+ private static DataResult ownedErrata(User user, String mode, Class clazz) {
+ SelectMode m;
+ if (clazz == null) {
+ m = ModeFactory.getMode("Errata_queries", mode);
+ }
+ else {
+ m = ModeFactory.getMode("Errata_queries", mode, clazz);
+ }
Map params = new HashMap();
params.put("org_id", user.getOrg().getId());
return makeDataResult(params, new HashMap(), null, m);
14 years, 2 months
backend/satellite_tools
by Justin Sherrill
backend/satellite_tools/spacewalk-remove-channel | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 405bd360f29dbd1d75dce8b7306e8191748c851a
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Mar 9 13:19:12 2010 -0500
fixing a few typos in spacewalk-remove-channel
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index cb17cf9..36b263f 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -159,7 +159,7 @@ def __serverCheck(labels, unsubscribe):
return __unsubscribeServers(labels)
print("\nCurrently there are systems subscribed to one or more of the specified channels.")
- print("If you would like to automatically unsubscribe these systems, simply use the --unusbscribe flag.\n")
+ print("If you would like to automatically unsubscribe these systems, simply use the --unsubscribe flag.\n")
print("The following systems were found to be subscribed:")
print 'org_id'.ljust(8),
@@ -193,7 +193,7 @@ def __unsubscribeServers(labels):
channel_counts[i['label']] = channel_counts[i['label']] + 1
else:
channel_counts[i['label']] = 1
- print("\nThe following channels will have their systems unsubscibed:")
+ print("\nThe following channels will have their systems unsubscribed:")
channel_list = channel_counts.keys()
channel_list.sort()
for i in channel_list:
14 years, 2 months
2 commits - java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 1 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 3ce8b3ddb455c59107cafaa6bdd1a544badebd35
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Mar 9 12:11:02 2010 -0500
fixing string comparison to resolve error checksumming message on rhel5 clients
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
index e7b1882..37f17c7 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
@@ -122,7 +122,7 @@ public class RepositoryWriter {
}
// translate sha1 to sha for xml repo files
String checksumLabel = this.checksumtype;
- if (checksumLabel == "sha1") {
+ if (checksumLabel.equals("sha1")) {
checksumLabel = "sha";
}
commit a391769c17058eefdd7b86e99a126279fb0bccf5
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Mar 9 12:10:42 2010 -0500
removing warning since hibernate uses this
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
index 87a7596..7eca2ef 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -387,7 +387,6 @@ public class Channel extends BaseDomainHelper implements Comparable {
* @return Returns the set of packages for this channel.
*/
public Set getPackages() {
- log.warn("Channel.getPackages() called, very inefficient operation proceeding");
return packages;
}
14 years, 2 months
2 commits - client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 4
client/rhel/rhn-client-tools/src/up2date_client/Makefile | 2
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 387 ----------
client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py | 37
client/rhel/rhn-client-tools/src/up2date_client/hardware_hal.py | 350 +++++++++
5 files changed, 426 insertions(+), 354 deletions(-)
New commits:
commit 732afb4ebea67000ec7b80df491aee594342c74f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 9 16:58:55 2010 +0100
564352 - use python-gudev if possible - empty stub for now
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index d489dc1..f27ab07 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -19,7 +19,11 @@ Requires: python-ethtool
Requires: gnupg
Requires: sh-utils
Requires: dbus-python
+%if 0%{?fedora} > 12 || 0%{?rhel} > 5
+Requires: python-gudev
+%else
Requires: hal >= 0.5.8.1-52
+%endif
Requires: newt
Requires: python-dmidecode
Requires: libxml2-python
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/Makefile b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
index 6f93fd5..d7ebbd8 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/Makefile
+++ b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
@@ -4,7 +4,7 @@
# rhn-client-tools and not here.
FILES := config gui hardware progress \
- haltree hardware_hal \
+ haltree hardware_hal hardware_gudev.py\
up2dateUtils getMethod tui \
up2dateLog rpmUtils rhnreg transaction \
up2dateErrors rpcServer up2dateAuth \
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index d2c8492..a451846 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -27,12 +27,17 @@ import config
import ethtool
import gettext
_ = gettext.gettext
-from haltree import HalTree, HalDevice
import dbus
import dmidecode
import up2dateLog
-from hardware_hal import check_hal_dbus_status, get_hal_computer, read_hal
+
+try: # F13 and EL6
+ from hardware_gudev import get_devices
+ using_gudev = 1
+except ImportError:
+ from hardware_hal import check_hal_dbus_status, get_hal_computer, read_hal
+ using_gudev = 0
# Some systems don't have the _locale module installed
try:
@@ -615,8 +620,11 @@ def read_dmi():
def get_hal_system_and_smbios():
try:
- computer = get_hal_computer()
- props = computer.GetAllProperties()
+ if using_gudev:
+ props = get_computer_info()
+ else:
+ computer = get_hal_computer()
+ props = computer.GetAllProperties()
except:
log = up2dateLog.initLog()
msg = "Error reading system and smbios information: %s\n" % (sys.exc_type)
@@ -655,28 +663,31 @@ def get_smbios():
# this one reads it all
def Hardware():
- hal_status, dbus_status = check_hal_dbus_status()
- hwdaemon = 1
- if hal_status or dbus_status:
- # if status != 0 haldaemon or messagebus service not running.
- # set flag and dont try probing hardware and DMI info
- # and warn the user.
- log = up2dateLog.initLog()
- msg = "Warning: haldaemon or messagebus service not running. Cannot probe hardware and DMI information.\n"
- log.log_me(msg)
- hwdaemon = 0
- allhw = []
-
- if hwdaemon:
- try:
- ret = read_hal()
- if ret:
- allhw = ret
- except:
- # bz253596 : Logging Dbus Error messages instead of printing on stdout
+ if using_gudev:
+ allhw = get_devices()
+ else:
+ hal_status, dbus_status = check_hal_dbus_status()
+ hwdaemon = 1
+ if hal_status or dbus_status:
+ # if status != 0 haldaemon or messagebus service not running.
+ # set flag and dont try probing hardware and DMI info
+ # and warn the user.
log = up2dateLog.initLog()
- msg = "Error reading hardware information: %s\n" % (sys.exc_type)
+ msg = "Warning: haldaemon or messagebus service not running. Cannot probe hardware and DMI information.\n"
log.log_me(msg)
+ hwdaemon = 0
+ allhw = []
+
+ if hwdaemon:
+ try:
+ ret = read_hal()
+ if ret:
+ allhw = ret
+ except:
+ # bz253596 : Logging Dbus Error messages instead of printing on stdout
+ log = up2dateLog.initLog()
+ msg = "Error reading hardware information: %s\n" % (sys.exc_type)
+ log.log_me(msg)
# all others return individual arrays
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
new file mode 100644
index 0000000..3114274
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware_gudev.py
@@ -0,0 +1,37 @@
+# Copyright (c) 2010 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+#
+
+import gudev
+import glib
+
+def get_devices:
+ """ Returns list of dictionaries with keys for every device in system
+ (values are provide as example):
+ 'bus' : 'pci'
+ 'driver' : 'pcieport-driver'
+ 'pciType' : '1'
+ 'detached' : '0'
+ 'class' : 'OTHER'
+ 'desc' : 'Intel Corporation|5000 Series Chipset PCI Express x4 Port 2'
+ """
+ pass
+
+def get_computer_info:
+ """ Return dictionaries with keys (values are provided as example):
+ 'system.formfactor': 'unknown'
+ 'system.kernel.version': '2.6.18-128.1.6.el5xen'
+ 'system.kernel.machine': 'i686'
+ 'system.kernel.name': 'Linux'
+ """
+ pass
commit 448771f441a7babd1bb456b8c59de744305e07a1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 9 15:38:30 2010 +0100
564352 - move hal specific code to separate module
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/Makefile b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
index b38fa90..6f93fd5 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/Makefile
+++ b/client/rhel/rhn-client-tools/src/up2date_client/Makefile
@@ -4,7 +4,7 @@
# rhn-client-tools and not here.
FILES := config gui hardware progress \
- haltree \
+ haltree hardware_hal \
up2dateUtils getMethod tui \
up2dateLog rpmUtils rhnreg transaction \
up2dateErrors rpcServer up2dateAuth \
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index a04222d..d2c8492 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -32,71 +32,7 @@ from haltree import HalTree, HalDevice
import dbus
import dmidecode
import up2dateLog
-
-#PCI DEVICE DEFINES
-# These are taken from pci_ids.h in the linux kernel source and used to
-# properly identify the hardware
-PCI_BASE_CLASS_STORAGE = 1
-PCI_CLASS_STORAGE_SCSI = 0
-PCI_CLASS_STORAGE_IDE = 1
-PCI_CLASS_STORAGE_FLOPPY = 2
-PCI_CLASS_STORAGE_IPI = 3
-PCI_CLASS_STORAGE_RAID = 4
-PCI_CLASS_STORAGE_OTHER = 80
-
-PCI_BASE_CLASS_NETWORK = 2
-PCI_CLASS_NETWORK_ETHERNET = 0
-PCI_CLASS_NETWORK_TOKEN_RING = 1
-PCI_CLASS_NETWORK_FDDI = 2
-PCI_CLASS_NETWORK_ATM = 3
-PCI_CLASS_NETWORK_OTHER = 80
-
-PCI_BASE_CLASS_DISPLAY = 3
-PCI_CLASS_DISPLAY_VGA = 0
-PCI_CLASS_DISPLAY_XGA = 1
-PCI_CLASS_DISPLAY_3D = 2
-PCI_CLASS_DISPLAY_OTHER = 80
-
-PCI_BASE_CLASS_MULTIMEDIA = 4
-PCI_CLASS_MULTIMEDIA_VIDEO = 0
-PCI_CLASS_MULTIMEDIA_AUDIO = 1
-PCI_CLASS_MULTIMEDIA_PHONE = 2
-PCI_CLASS_MULTIMEDIA_OTHER = 80
-
-PCI_BASE_CLASS_BRIDGE = 6
-PCI_CLASS_BRIDGE_HOST = 0
-PCI_CLASS_BRIDGE_ISA = 1
-PCI_CLASS_BRIDGE_EISA = 2
-PCI_CLASS_BRIDGE_MC = 3
-PCI_CLASS_BRIDGE_PCI = 4
-PCI_CLASS_BRIDGE_PCMCIA = 5
-PCI_CLASS_BRIDGE_NUBUS = 6
-PCI_CLASS_BRIDGE_CARDBUS = 7
-PCI_CLASS_BRIDGE_RACEWAY = 8
-PCI_CLASS_BRIDGE_OTHER = 80
-
-PCI_BASE_CLASS_COMMUNICATION = 7
-PCI_CLASS_COMMUNICATION_SERIAL = 0
-PCI_CLASS_COMMUNICATION_PARALLEL = 1
-PCI_CLASS_COMMUNICATION_MULTISERIAL = 2
-PCI_CLASS_COMMUNICATION_MODEM = 3
-PCI_CLASS_COMMUNICATION_OTHER = 80
-
-PCI_BASE_CLASS_INPUT = 9
-PCI_CLASS_INPUT_KEYBOARD = 0
-PCI_CLASS_INPUT_PEN = 1
-PCI_CLASS_INPUT_MOUSE = 2
-PCI_CLASS_INPUT_SCANNER = 3
-PCI_CLASS_INPUT_GAMEPORT = 4
-PCI_CLASS_INPUT_OTHER = 80
-
-PCI_BASE_CLASS_SERIAL = 12
-PCI_CLASS_SERIAL_FIREWIRE = 0
-PCI_CLASS_SERIAL_ACCESS = 1
-PCI_CLASS_SERIAL_SSA = 2
-PCI_CLASS_SERIAL_USB = 3
-PCI_CLASS_SERIAL_FIBER = 4
-PCI_CLASS_SERIAL_SMBUS = 5
+from hardware_hal import check_hal_dbus_status, get_hal_computer, read_hal
# Some systems don't have the _locale module installed
try:
@@ -180,249 +116,6 @@ def dmi_system_uuid():
uuid = ''
return uuid
-# read_hal()
-#
-# This reads in all the properties for each device from HAL, storing the
-# property names & values into a dict. A list of dicts is returned.
-#
-# This only works on newer versions of dbus & HAL (as found in RHEL5)
-def read_hal():
- ret = []
- bus = dbus.SystemBus()
-
- hal_manager_obj = bus.get_object('org.freedesktop.Hal',
- '/org/freedesktop/Hal/Manager')
- hal_manager = dbus.Interface(hal_manager_obj,
- 'org.freedesktop.Hal.Manager')
-
- device_list = hal_manager.GetAllDevices()
- hal_tree = HalTree()
- for udi in device_list:
- device_obj = bus.get_object ('org.freedesktop.Hal', udi)
- device = dbus.Interface(device_obj, 'org.freedesktop.Hal.Device')
-
- properties = device.GetAllProperties()
-
- haldev = HalDevice(properties)
- hal_tree.add(haldev)
-
- kudzu_list = process_hal_nodes(hal_tree.head)
- return kudzu_list
-
- # Recursive function, does all the dirty work for add_hal_hardware
-def process_hal_nodes(node):
- kudzu_list = []
- node.classification = classify_hal(node)
- if node.classification:
- parent = node.parent
- dev = {}
- dev['class'] = node.classification
- #get bus
- dev['bus'] = str(get_device_bus(node))
-
- #get scsi info
- if dev['bus'] == 'scsi':
- if parent.properties.has_key('scsi.host'):
- dev['prop1'] = parent.properties['scsi.host']
- if parent.properties.has_key('scsi.target'):
- dev['prop2'] = parent.properties['scsi.target']
- if parent.properties.has_key('scsi.bus'):
- dev['prop3'] = parent.properties['scsi.bus']
- if parent.properties.has_key('scsi.lun'):
- dev['prop4'] = parent.properties['scsi.lun']
-
-
- dev['driver'] = str(get_device_driver(node))
-
- device_path = get_device_path(node)
- if device_path:
- dev['device'] = str(device_path)
-
- dev['desc'] = str(get_device_description(node))
-
- dev['pciType'] = str(get_device_pcitype(node))
-
- dev['detached'] = 0
- kudzu_list.append(dev)
-
- for child in node.children:
- child_list = process_hal_nodes(child)
- kudzu_list.extend(child_list)
-
- return kudzu_list
-
-
-
-def classify_hal(node):
- # NETWORK
- if node.properties.has_key('net.interface'):
- return 'NETWORK'
-
- if node.properties.has_key('info.product') and node.properties.has_key('info.category'):
- if node.properties['info.category'] == 'input':
- # KEYBOARD <-- do this before mouse, some keyboards have built-in mice
- if 'keyboard' in node.properties['info.product'].lower():
- return 'KEYBOARD'
- # MOUSE
- if 'mouse' in node.properties['info.product'].lower():
- return 'MOUSE'
-
- if node.properties.has_key('pci.device_class'):
- #VIDEO
- if node.properties['pci.device_class'] == PCI_BASE_CLASS_DISPLAY:
- return 'VIDEO'
- #USB
- if (node.properties['pci.device_class'] == PCI_BASE_CLASS_SERIAL
- and node.properties['pci.device_subclass'] == PCI_CLASS_SERIAL_USB):
- return 'USB'
-
- if node.properties['pci.device_class'] == PCI_BASE_CLASS_STORAGE:
- #IDE
- if node.properties['pci.device_subclass'] == PCI_CLASS_STORAGE_IDE:
- return 'IDE'
- #SCSI
- if node.properties['pci.device_subclass'] == PCI_CLASS_STORAGE_SCSI:
- return 'SCSI'
- #RAID
- if node.properties['pci.device_subclass'] == PCI_CLASS_STORAGE_RAID:
- return 'RAID'
- #MODEM
- if (node.properties['pci.device_class'] == PCI_BASE_CLASS_COMMUNICATION
- and node.properties['pci.device_subclass'] == PCI_CLASS_COMMUNICATION_MODEM):
- return 'MODEM'
- #SCANNER
- if (node.properties['pci.device_class'] == PCI_BASE_CLASS_INPUT
- and node.properties['pci.device_subclass'] == PCI_CLASS_INPUT_SCANNER):
- return 'SCANNER'
-
- if node.properties['pci.device_class'] == PCI_BASE_CLASS_MULTIMEDIA:
- #CAPTURE -- video capture card
- if node.properties['pci.device_subclass'] == PCI_CLASS_MULTIMEDIA_VIDEO:
- return 'CAPTURE'
- #AUDIO
- if node.properties['pci.device_subclass'] == PCI_CLASS_MULTIMEDIA_AUDIO:
- return 'AUDIO'
-
- #FIREWIRE
- if (node.properties['pci.device_class'] == PCI_BASE_CLASS_SERIAL
- and node.properties['pci.device_subclass'] == PCI_CLASS_SERIAL_FIREWIRE):
- return 'FIREWIRE'
- #SOCKET -- PCMCIA yenta socket stuff
- if (node.properties['pci.device_class'] == PCI_BASE_CLASS_BRIDGE
- and (node.properties['pci.device_subclass'] == PCI_CLASS_BRIDGE_PCMCIA
- or node.properties['pci.device_subclass'] == PCI_CLASS_BRIDGE_CARDBUS)):
- return 'SOCKET'
-
- if node.properties.has_key('storage.drive_type'):
- #CDROM
- if node.properties['storage.drive_type'] == 'cdrom':
- return 'CDROM'
- #HD
- if node.properties['storage.drive_type'] == 'disk':
- return 'HD'
- #FLOPPY
- if node.properties['storage.drive_type'] == 'floppy':
- return 'FLOPPY'
- #TAPE
- if node.properties['storage.drive_type'] == 'tape':
- return 'TAPE'
-
- #PRINTER
- if node.properties.has_key('printer.product'):
- return 'PRINTER'
-
- #Catchall for specific devices, only do this after all the others
- if (node.properties.has_key('pci.product_id') or
- node.properties.has_key('usb.product_id')):
- return 'OTHER'
-
- # No class found
- return None
-
-def get_device_bus(node):
- if node.properties.has_key('storage.bus'):
- bus = node.properties['storage.bus']
- elif node.properties.has_key('info.bus'):
- if node.properties['info.bus'] == 'platform':
- bus = 'MISC'
- else:
- bus = node.properties['info.bus']
- else:
- bus = 'MISC'
-
- return bus
-
-def get_device_driver(node):
- if node.properties.has_key('info.linux.driver'):
- driver = node.properties['info.linux.driver']
- elif node.properties.has_key('net.linux.driver'):
- driver = node.properties['net.linux.driver']
- else:
- driver = 'unknown'
-
- return driver
-
-def get_device_path(node):
- """
- Return the device file path.
-
- As kudzu did not return a string with the /dev/ prefix,
- this function will not, either.
- RHN's DB has a limit of 16 characters for the device path.
- If the path is longer than that, return None.
- If no device path is found, return None.
- """
- dev = None
-
- if node.properties.has_key('block.device'):
- dev = node.properties['block.device']
- elif node.properties.has_key('linux.device_file'):
- dev = node.properties['linux.device_file']
- elif (node.classification == 'NETWORK'
- and node.properties.has_key('net.interface')):
- dev = node.properties['net.interface']
-
- if dev:
- if dev.startswith('/dev/'):
- dev = dev[5:]
- if len(dev) > 16:
- dev = None
-
- return dev
-
-def get_device_description(node):
- if (node.properties.has_key('info.vendor')
- and node.properties.has_key('info.product')):
- desc = node.properties['info.vendor'] + '|' + node.properties['info.product']
- elif (node.properties.has_key('info.vendor')):
- desc = node.properties['info.vendor']
- elif node.properties.has_key('info.product'):
- desc = node.properties['info.product']
- else:
- desc = ""
-
- return desc
-
-def get_device_pcitype(node):
- PCI_TYPE_PCMCIA = 2
- PCI_TYPE_PCI = 1
- PCI_TYPE_NOT_PCI = -1
-
- if (node.properties.has_key('info.bus')
- and node.properties['info.bus'] == 'pci'):
- parent = node.parent
- if (parent.properties.has_key('pci.device_class')
- and (parent.properties['pci.device_class'] == 6
- and (parent.properties['pci.device_subclass'] == 5
- or parent.properties['pci.device_subclass'] == 7))):
- pcitype = PCI_TYPE_PCMCIA
- else:
- pcitype = PCI_TYPE_PCI
- else:
- pcitype = PCI_TYPE_NOT_PCI
-
- return pcitype
-
def read_installinfo():
if not os.access("/etc/sysconfig/installinfo", os.R_OK):
return {}
@@ -861,22 +554,6 @@ def read_network_interfaces():
return intDict
-def get_device_property(device, property_name):
- """ Return a hal device property, or None if it does not exist. """
- if device.PropertyExists(property_name):
- # Convert from unicode to ascii in case the server can't handle it.
- return str(device.GetProperty(property_name))
- else:
- return None
-
-def get_hal_computer():
- bus = dbus.SystemBus()
- computer_obj = bus.get_object("org.freedesktop.Hal",
- "/org/freedesktop/Hal/devices/computer")
- computer = dbus.Interface(computer_obj, "org.freedesktop.Hal.Device")
-
- return computer
-
# Read DMI information via hal.
def read_dmi():
dmidict = {}
@@ -976,13 +653,6 @@ def get_smbios():
'smbios.system.version': get_dmi_data('/dmidecode/SystemInfo/Version'),
}
-def check_hal_dbus_status():
- # check if hal and messagebus are running, if not warn the user
- import commands
- hal_status, msg = commands.getstatusoutput('/etc/init.d/haldaemon status')
- dbus_status, msg = commands.getstatusoutput('/etc/init.d/messagebus status')
- return hal_status, dbus_status
-
# this one reads it all
def Hardware():
hal_status, dbus_status = check_hal_dbus_status()
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware_hal.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware_hal.py
new file mode 100644
index 0000000..703a24a
--- /dev/null
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware_hal.py
@@ -0,0 +1,350 @@
+#
+# Copyright (c) 1999--2010 Red Hat Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+#
+
+""" Get hardware info using HAL """
+
+from haltree import HalTree, HalDevice
+import dbus
+
+#PCI DEVICE DEFINES
+# These are taken from pci_ids.h in the linux kernel source and used to
+# properly identify the hardware
+PCI_BASE_CLASS_STORAGE = 1
+PCI_CLASS_STORAGE_SCSI = 0
+PCI_CLASS_STORAGE_IDE = 1
+PCI_CLASS_STORAGE_FLOPPY = 2
+PCI_CLASS_STORAGE_IPI = 3
+PCI_CLASS_STORAGE_RAID = 4
+PCI_CLASS_STORAGE_OTHER = 80
+
+PCI_BASE_CLASS_NETWORK = 2
+PCI_CLASS_NETWORK_ETHERNET = 0
+PCI_CLASS_NETWORK_TOKEN_RING = 1
+PCI_CLASS_NETWORK_FDDI = 2
+PCI_CLASS_NETWORK_ATM = 3
+PCI_CLASS_NETWORK_OTHER = 80
+
+PCI_BASE_CLASS_DISPLAY = 3
+PCI_CLASS_DISPLAY_VGA = 0
+PCI_CLASS_DISPLAY_XGA = 1
+PCI_CLASS_DISPLAY_3D = 2
+PCI_CLASS_DISPLAY_OTHER = 80
+
+PCI_BASE_CLASS_MULTIMEDIA = 4
+PCI_CLASS_MULTIMEDIA_VIDEO = 0
+PCI_CLASS_MULTIMEDIA_AUDIO = 1
+PCI_CLASS_MULTIMEDIA_PHONE = 2
+PCI_CLASS_MULTIMEDIA_OTHER = 80
+
+PCI_BASE_CLASS_BRIDGE = 6
+PCI_CLASS_BRIDGE_HOST = 0
+PCI_CLASS_BRIDGE_ISA = 1
+PCI_CLASS_BRIDGE_EISA = 2
+PCI_CLASS_BRIDGE_MC = 3
+PCI_CLASS_BRIDGE_PCI = 4
+PCI_CLASS_BRIDGE_PCMCIA = 5
+PCI_CLASS_BRIDGE_NUBUS = 6
+PCI_CLASS_BRIDGE_CARDBUS = 7
+PCI_CLASS_BRIDGE_RACEWAY = 8
+PCI_CLASS_BRIDGE_OTHER = 80
+
+PCI_BASE_CLASS_COMMUNICATION = 7
+PCI_CLASS_COMMUNICATION_SERIAL = 0
+PCI_CLASS_COMMUNICATION_PARALLEL = 1
+PCI_CLASS_COMMUNICATION_MULTISERIAL = 2
+PCI_CLASS_COMMUNICATION_MODEM = 3
+PCI_CLASS_COMMUNICATION_OTHER = 80
+
+PCI_BASE_CLASS_INPUT = 9
+PCI_CLASS_INPUT_KEYBOARD = 0
+PCI_CLASS_INPUT_PEN = 1
+PCI_CLASS_INPUT_MOUSE = 2
+PCI_CLASS_INPUT_SCANNER = 3
+PCI_CLASS_INPUT_GAMEPORT = 4
+PCI_CLASS_INPUT_OTHER = 80
+
+PCI_BASE_CLASS_SERIAL = 12
+PCI_CLASS_SERIAL_FIREWIRE = 0
+PCI_CLASS_SERIAL_ACCESS = 1
+PCI_CLASS_SERIAL_SSA = 2
+PCI_CLASS_SERIAL_USB = 3
+PCI_CLASS_SERIAL_FIBER = 4
+PCI_CLASS_SERIAL_SMBUS = 5
+
+# read_hal()
+#
+# This reads in all the properties for each device from HAL, storing the
+# property names & values into a dict. A list of dicts is returned.
+#
+# This only works on newer versions of dbus & HAL (as found in RHEL5)
+def read_hal():
+ ret = []
+ bus = dbus.SystemBus()
+
+ hal_manager_obj = bus.get_object('org.freedesktop.Hal',
+ '/org/freedesktop/Hal/Manager')
+ hal_manager = dbus.Interface(hal_manager_obj,
+ 'org.freedesktop.Hal.Manager')
+
+ device_list = hal_manager.GetAllDevices()
+ hal_tree = HalTree()
+ for udi in device_list:
+ device_obj = bus.get_object ('org.freedesktop.Hal', udi)
+ device = dbus.Interface(device_obj, 'org.freedesktop.Hal.Device')
+
+ properties = device.GetAllProperties()
+
+ haldev = HalDevice(properties)
+ hal_tree.add(haldev)
+
+ kudzu_list = process_hal_nodes(hal_tree.head)
+ return kudzu_list
+
+ # Recursive function, does all the dirty work for add_hal_hardware
+def process_hal_nodes(node):
+ kudzu_list = []
+ node.classification = classify_hal(node)
+ if node.classification:
+ parent = node.parent
+ dev = {}
+ dev['class'] = node.classification
+ #get bus
+ dev['bus'] = str(get_device_bus(node))
+
+ #get scsi info
+ if dev['bus'] == 'scsi':
+ if parent.properties.has_key('scsi.host'):
+ dev['prop1'] = parent.properties['scsi.host']
+ if parent.properties.has_key('scsi.target'):
+ dev['prop2'] = parent.properties['scsi.target']
+ if parent.properties.has_key('scsi.bus'):
+ dev['prop3'] = parent.properties['scsi.bus']
+ if parent.properties.has_key('scsi.lun'):
+ dev['prop4'] = parent.properties['scsi.lun']
+
+
+ dev['driver'] = str(get_device_driver(node))
+
+ device_path = get_device_path(node)
+ if device_path:
+ dev['device'] = str(device_path)
+
+ dev['desc'] = str(get_device_description(node))
+
+ dev['pciType'] = str(get_device_pcitype(node))
+
+ dev['detached'] = 0
+ kudzu_list.append(dev)
+
+ for child in node.children:
+ child_list = process_hal_nodes(child)
+ kudzu_list.extend(child_list)
+
+ return kudzu_list
+
+def classify_hal(node):
+ # NETWORK
+ if node.properties.has_key('net.interface'):
+ return 'NETWORK'
+
+ if node.properties.has_key('info.product') and node.properties.has_key('info.category'):
+ if node.properties['info.category'] == 'input':
+ # KEYBOARD <-- do this before mouse, some keyboards have built-in mice
+ if 'keyboard' in node.properties['info.product'].lower():
+ return 'KEYBOARD'
+ # MOUSE
+ if 'mouse' in node.properties['info.product'].lower():
+ return 'MOUSE'
+
+ if node.properties.has_key('pci.device_class'):
+ #VIDEO
+ if node.properties['pci.device_class'] == PCI_BASE_CLASS_DISPLAY:
+ return 'VIDEO'
+ #USB
+ if (node.properties['pci.device_class'] == PCI_BASE_CLASS_SERIAL
+ and node.properties['pci.device_subclass'] == PCI_CLASS_SERIAL_USB):
+ return 'USB'
+
+ if node.properties['pci.device_class'] == PCI_BASE_CLASS_STORAGE:
+ #IDE
+ if node.properties['pci.device_subclass'] == PCI_CLASS_STORAGE_IDE:
+ return 'IDE'
+ #SCSI
+ if node.properties['pci.device_subclass'] == PCI_CLASS_STORAGE_SCSI:
+ return 'SCSI'
+ #RAID
+ if node.properties['pci.device_subclass'] == PCI_CLASS_STORAGE_RAID:
+ return 'RAID'
+ #MODEM
+ if (node.properties['pci.device_class'] == PCI_BASE_CLASS_COMMUNICATION
+ and node.properties['pci.device_subclass'] == PCI_CLASS_COMMUNICATION_MODEM):
+ return 'MODEM'
+ #SCANNER
+ if (node.properties['pci.device_class'] == PCI_BASE_CLASS_INPUT
+ and node.properties['pci.device_subclass'] == PCI_CLASS_INPUT_SCANNER):
+ return 'SCANNER'
+
+ if node.properties['pci.device_class'] == PCI_BASE_CLASS_MULTIMEDIA:
+ #CAPTURE -- video capture card
+ if node.properties['pci.device_subclass'] == PCI_CLASS_MULTIMEDIA_VIDEO:
+ return 'CAPTURE'
+ #AUDIO
+ if node.properties['pci.device_subclass'] == PCI_CLASS_MULTIMEDIA_AUDIO:
+ return 'AUDIO'
+
+ #FIREWIRE
+ if (node.properties['pci.device_class'] == PCI_BASE_CLASS_SERIAL
+ and node.properties['pci.device_subclass'] == PCI_CLASS_SERIAL_FIREWIRE):
+ return 'FIREWIRE'
+ #SOCKET -- PCMCIA yenta socket stuff
+ if (node.properties['pci.device_class'] == PCI_BASE_CLASS_BRIDGE
+ and (node.properties['pci.device_subclass'] == PCI_CLASS_BRIDGE_PCMCIA
+ or node.properties['pci.device_subclass'] == PCI_CLASS_BRIDGE_CARDBUS)):
+ return 'SOCKET'
+
+ if node.properties.has_key('storage.drive_type'):
+ #CDROM
+ if node.properties['storage.drive_type'] == 'cdrom':
+ return 'CDROM'
+ #HD
+ if node.properties['storage.drive_type'] == 'disk':
+ return 'HD'
+ #FLOPPY
+ if node.properties['storage.drive_type'] == 'floppy':
+ return 'FLOPPY'
+ #TAPE
+ if node.properties['storage.drive_type'] == 'tape':
+ return 'TAPE'
+
+ #PRINTER
+ if node.properties.has_key('printer.product'):
+ return 'PRINTER'
+
+ #Catchall for specific devices, only do this after all the others
+ if (node.properties.has_key('pci.product_id') or
+ node.properties.has_key('usb.product_id')):
+ return 'OTHER'
+
+ # No class found
+ return None
+
+def get_device_bus(node):
+ if node.properties.has_key('storage.bus'):
+ bus = node.properties['storage.bus']
+ elif node.properties.has_key('info.bus'):
+ if node.properties['info.bus'] == 'platform':
+ bus = 'MISC'
+ else:
+ bus = node.properties['info.bus']
+ else:
+ bus = 'MISC'
+
+ return bus
+
+def get_device_driver(node):
+ if node.properties.has_key('info.linux.driver'):
+ driver = node.properties['info.linux.driver']
+ elif node.properties.has_key('net.linux.driver'):
+ driver = node.properties['net.linux.driver']
+ else:
+ driver = 'unknown'
+
+ return driver
+
+def get_device_path(node):
+ """
+ Return the device file path.
+
+ As kudzu did not return a string with the /dev/ prefix,
+ this function will not, either.
+ RHN's DB has a limit of 16 characters for the device path.
+ If the path is longer than that, return None.
+ If no device path is found, return None.
+ """
+ dev = None
+
+ if node.properties.has_key('block.device'):
+ dev = node.properties['block.device']
+ elif node.properties.has_key('linux.device_file'):
+ dev = node.properties['linux.device_file']
+ elif (node.classification == 'NETWORK'
+ and node.properties.has_key('net.interface')):
+ dev = node.properties['net.interface']
+
+ if dev:
+ if dev.startswith('/dev/'):
+ dev = dev[5:]
+ if len(dev) > 16:
+ dev = None
+
+ return dev
+
+def get_device_description(node):
+ if (node.properties.has_key('info.vendor')
+ and node.properties.has_key('info.product')):
+ desc = node.properties['info.vendor'] + '|' + node.properties['info.product']
+ elif (node.properties.has_key('info.vendor')):
+ desc = node.properties['info.vendor']
+ elif node.properties.has_key('info.product'):
+ desc = node.properties['info.product']
+ else:
+ desc = ""
+
+ return desc
+
+def get_device_pcitype(node):
+ PCI_TYPE_PCMCIA = 2
+ PCI_TYPE_PCI = 1
+ PCI_TYPE_NOT_PCI = -1
+
+ if (node.properties.has_key('info.bus')
+ and node.properties['info.bus'] == 'pci'):
+ parent = node.parent
+ if (parent.properties.has_key('pci.device_class')
+ and (parent.properties['pci.device_class'] == 6
+ and (parent.properties['pci.device_subclass'] == 5
+ or parent.properties['pci.device_subclass'] == 7))):
+ pcitype = PCI_TYPE_PCMCIA
+ else:
+ pcitype = PCI_TYPE_PCI
+ else:
+ pcitype = PCI_TYPE_NOT_PCI
+
+ return pcitype
+
+def get_device_property(device, property_name):
+ """ Return a hal device property, or None if it does not exist. """
+ if device.PropertyExists(property_name):
+ # Convert from unicode to ascii in case the server can't handle it.
+ return str(device.GetProperty(property_name))
+ else:
+ return None
+
+def get_hal_computer():
+ bus = dbus.SystemBus()
+ computer_obj = bus.get_object("org.freedesktop.Hal",
+ "/org/freedesktop/Hal/devices/computer")
+ computer = dbus.Interface(computer_obj, "org.freedesktop.Hal.Device")
+
+ return computer
+
+def check_hal_dbus_status():
+ # check if hal and messagebus are running, if not warn the user
+ import commands
+ hal_status, msg = commands.getstatusoutput('/etc/init.d/haldaemon status')
+ dbus_status, msg = commands.getstatusoutput('/etc/init.d/messagebus status')
+ return hal_status, dbus_status
+
+
14 years, 2 months
Changes to 'refs/tags/spacewalk-schema-0.9.2-1'
by Michael Mraka
Tag 'spacewalk-schema-0.9.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-09 10:25 +0000
Tagging package [spacewalk-schema] version [0.9.2-1] in directory [schema/spacewalk/].
Changes since spacewalk-branding-0.9.3-1:
Michael Mraka (2):
fixed typos
Automatic commit of package [spacewalk-schema] release [0.9.2-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
web/modules/rhn/RHN/Cert.pm | 6 +++---
3 files changed, 10 insertions(+), 5 deletions(-)
---
14 years, 2 months
rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 82cc955826cca72c324753b13b40c5972c643ed7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 9 11:25:49 2010 +0100
Automatic commit of package [spacewalk-schema] release [0.9.2-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 4b0d885..4b7521d 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-0.9.1-1 schema/spacewalk/
+0.9.2-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 6628f9e..f15b3ee 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 0.9.1
+Version: 0.9.2
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -58,6 +58,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Tue Mar 09 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.2-1
+- 568293 - don't allow duplicated rows in rhnChecksum
+- added constraints to rhnReleaseChannelMap
+- repo generation changes, precomputing package repodata
+
* Thu Feb 18 2010 Miroslav Suchý <msuchy(a)redhat.com> 0.9.1-1
- support for Debian (lukas.durfina(a)gmail.com)
14 years, 2 months
web/modules
by Michael Mraka
web/modules/rhn/RHN/Cert.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d21697b0470aa82d306422db40c9751de44a4aeb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 8 23:56:57 2010 +0100
fixed typos
diff --git a/web/modules/rhn/RHN/Cert.pm b/web/modules/rhn/RHN/Cert.pm
index 8cef6af..58c1cd0 100644
--- a/web/modules/rhn/RHN/Cert.pm
+++ b/web/modules/rhn/RHN/Cert.pm
@@ -161,11 +161,11 @@ sub check_signature {
my ( $data_fh, $data_file ) = File::Temp::tempfile();
print $data_fh $data;
- close $data_fh
+ close $data_fh;
my ( $sig_fh, $sig_file ) = File::Temp::tempfile();
print $sig_fh $signature;
- close $sig_fh
+ close $sig_fh;
system("gpg --verify -q --keyring $keyring $sig_file $data_file");
@@ -187,7 +187,7 @@ sub compute_signature {
my ( $data_fh, $data_file ) = File::Temp::tempfile();
print $data_fh $data;
- close $data_fh
+ close $data_fh;
my $pid = IPC::Open3::open3(my $wfh, my $rfh, '>&STDERR',
qw|gpg -q --batch --yes --passphrase-fd 0 --sign --detach-sign --armor
14 years, 2 months
Changes to 'refs/tags/spacewalk-branding-0.9.3-1'
by Michael Mraka
Tag 'spacewalk-branding-0.9.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-03-08 22:49 +0000
Tagging package [spacewalk-branding] version [0.9.3-1] in directory [branding/].
Changes since spacewalk-web-0.9.3-1:
Justin Sherrill (1):
fixing import on spacewalk-remove-channel
Michael Mraka (2):
486430 - changed organization name in default cert
Automatic commit of package [spacewalk-branding] release [0.9.3-1].
---
backend/satellite_tools/spacewalk-remove-channel | 4 ++--
branding/setup/spacewalk-public.cert | 8 ++++----
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-branding | 2 +-
4 files changed, 11 insertions(+), 8 deletions(-)
---
14 years, 2 months
2 commits - branding/setup branding/spacewalk-branding.spec rel-eng/packages
by Michael Mraka
branding/setup/spacewalk-public.cert | 8 ++++----
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-branding | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit a4cb92be238582a95dd347f27918e8b3eee295a5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 8 23:49:45 2010 +0100
Automatic commit of package [spacewalk-branding] release [0.9.3-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index f7d65db..0ba5e72 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 0.9.2
+Version: 0.9.3
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -80,6 +80,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Mar 08 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.3-1
+- 486430 - changed organization name in default cert
+
* Thu Feb 11 2010 Justin Sherrill <jsherril(a)redhat.com> 0.9.2-1
- updating branding package for tomcat6 (jsherril(a)redhat.com)
- let's start Spacewalk 0.9 (michael.mraka(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index cec9e76..26924d3 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-0.9.2-1 branding/
+0.9.3-1 branding/
commit b14d5f7f0331567c2fdc5085f32c2fe67cdc6e40
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Mar 8 23:44:23 2010 +0100
486430 - changed organization name in default cert
diff --git a/branding/setup/spacewalk-public.cert b/branding/setup/spacewalk-public.cert
index b7b036f..34fa29f 100644
--- a/branding/setup/spacewalk-public.cert
+++ b/branding/setup/spacewalk-public.cert
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<rhn-cert version="0.1">
<rhn-cert-field name="product">SPACEWALK-001</rhn-cert-field>
- <rhn-cert-field name="owner">Spacewalk Public Cert</rhn-cert-field>
+ <rhn-cert-field name="owner">Spacewalk Default Organization</rhn-cert-field>
<rhn-cert-field name="issued">2007-07-13 00:00:00</rhn-cert-field>
<rhn-cert-field name="expires">2015-07-13 00:00:00</rhn-cert-field>
<rhn-cert-field name="slots">20000</rhn-cert-field>
@@ -15,9 +15,9 @@
-----BEGIN PGP SIGNATURE-----
Version: Crypt::OpenPGP 1.03
-iQBGBAARAwAGBQJLWH5GAAoJEJ5yna8GlHkyMBEAn03hy3A12ssw9IV5dhwUNnas
-ocxvAJ9sQ5zHoJv+5Ib1GVEKmNE0v3a0rg==
-=tyNI
+iD8DBQBLlXyotGJPvuPojtERAiOyAJ9fB0kAoN75IvjJvucvRB7nPkJWzgCfRPgF
+ghRRGlQyDJFYxxKxZtbEGAE=
+=XEp6
-----END PGP SIGNATURE-----
</rhn-cert-signature>
</rhn-cert>
14 years, 2 months
backend/satellite_tools
by Justin Sherrill
backend/satellite_tools/spacewalk-remove-channel | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5c9f363451424a843db593429990b185747b0df3
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Mar 8 17:34:04 2010 -0500
fixing import on spacewalk-remove-channel
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 88538fd..cb17cf9 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -30,9 +30,9 @@ if _LIBPATH not in sys.path:
sys.path.append(_LIBPATH)
try:
- from rhn import rhnLockfile #new place for rhnLockFile
+ from rhn import rhnLockfile #new place for rhnLockfile
except:
- from common import rhnLockFile #old place for rhnLockFile
+ from common import rhnLockfile #old place for rhnLockfile
from satellite_tools.progress_bar import ProgressBar
from common import CFG, initCFG, initLOG, log_debug, log_error
14 years, 2 months