3 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý
backend/server/importlib/backend.py | 10 +++++-----
backend/spacewalk-backend.spec | 8 +++++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 0572f98df04892bb5446b9a0a95491e5e4d2ed2e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 15 17:17:37 2010 +0100
Automatic commit of package [spacewalk-backend] release [1.3.26-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index fc82026..306aad6 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.3.25
+Version: 1.3.26
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Dec 15 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.26-1
+- 624092 - update package if pushing using --force and package with same NVREA
+ already exist
+- no need to lookup dictionary, when we have this information in local variable
+- make Table class more debugable
+
* Wed Dec 15 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.25-1
- removed dead code
- fixed number of pylint reported errors
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 3e4c4cf..ea3f9f7 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.25-1 backend/
+1.3.26-1 backend/
commit d1a9e12d8b5409ab54c029a6a9b7e9f72d157a89
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 15 17:15:20 2010 +0100
624092 - update package if pushing using --force and package with same NVREA already exist
this regression has been caused by commit b4261f748940a3a34d2747162cda348fe0589be1
we do not want to have checksum_id as PK if NVREA is disabled
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index 639ec0b..3fc8b37 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -1969,10 +1969,10 @@ class Backend:
def validate_pks(self):
# If nevra is enabled use checksum as primary key
tbs = self.tables['rhnPackage']
- if CFG.ENABLE_NVREA:
- # Add checksum as a primarykey if nevra is enabled
- if 'checksum_id' not in tbs.pk:
- tbs.pk.append('checksum_id')
+ if not CFG.ENABLE_NVREA:
+ # remove checksum from a primary key if nevra is disabled.
+ if 'checksum_id' in tbs.pk:
+ tbs.pk.remove('checksum_id')
# Returns a tuple for the hash's values
def build_key(hash, fields):
commit d9906c4b90aa0ceac1a70b0f6543fe289e5abd1f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 15 16:43:32 2010 +0100
no need to lookup dictionary, when we have this information in local variable
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index cd91c2e..639ec0b 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -1471,7 +1471,7 @@ class Backend:
brokenTransaction = 0
# Lookup object
- lookup = TableLookup(self.tables[parentTable], self.dbmodule)
+ lookup = TableLookup(parentTableObj, self.dbmodule)
# XXX
childTableLookups = self.__buildQueries(childTables)
# For each valid object in the collection, look it up
13 years, 5 months
backend/server
by Miroslav Suchý
backend/server/importlib/backendLib.py | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit ee28825b6081e3a7f5732264502383e9013462d0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 15 15:11:28 2010 +0100
make Table class more debugable
change str(Table) from something like:
<Instance of server.importlib.backendLib.Table at 0xffffffff>
to something like:
Instance of server.importlib.backendLib.Table: PK: ['org_id', 'name_id', 'evr_id', 'package_arch_id', 'checksum_id'], Fields: {'build_time': <server.importlib.backendLib.DBdateTime instance at 0x2b9bd9ec50e0>, ...}]
diff --git a/backend/server/importlib/backendLib.py b/backend/server/importlib/backendLib.py
index 4106f90..db280d2 100644
--- a/backend/server/importlib/backendLib.py
+++ b/backend/server/importlib/backendLib.py
@@ -110,6 +110,11 @@ class Table:
if not self.fields.has_key(field):
raise TypeError("Unknown primary key field %s" % field)
+ def __str__(self):
+ return "Instance of class %s.%s: PK: %s, Fields: %s" % (self.__class__.__module__,
+ self.__class__.__name__, self.pk, self.fields)
+ __repr__ = __str__
+
def isNullable(self, field):
if not self.fields.has_key(field):
raise TypeError("Unknown field %s" % field)
13 years, 5 months
Changes to 'refs/tags/spacewalk-backend-1.3.25-1'
by Michael Mraka
Tag 'spacewalk-backend-1.3.25-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-12-15 15:05 +0000
Tagging package [spacewalk-backend] version [1.3.25-1] in directory [backend/].
Changes since spacewalk-web-1.3.14-1:
Jan Blazek (1):
Add *-javadoc packages to new docs group
Michael Mraka (16):
fixed RHN 27637 2010/12/15 06:16:44 -04:00: ("Module sat doesn't support our API",)
fixed E9905:453:ConfigManagement.management_diff: Too many arguments for format string
fixed E1101:120:apacheHandler._init_request_processor: Instance of 'apachePOST' has no 'init_request' member
fixed E1101:335:make_evr: Class 'rhnException' has no 'rhnFault' member
fixed E0602:199:Database.transaction: Undefined variable 'rhnException'
fixed E0602:348:Database.function: Undefined variable 'sql_base'
fixed E1111:248:server_token.token_packages: Assigning to function call which doesn't return
fixed E0602:100:delete_guests: Undefined variable 'log_error'
fixed E1101:245:XML_Dumper.dump_channel_packages_short: Instance of 'XML_Dumper' has no '_send_headers' member
fixed E1111:248:server_token.token_packages: Assigning to function call which doesn't return
removed dead schedule_server_packages_update()
fixed E1103:211:main: Instance of 'ChannelDumper' has no 'setID' member (but some types could not be inferred)
fixed E1101:223:ChannelDumper._getArgs: Instance of 'ChannelDumper' has no 'snapshot' member
fixed E1101:318:ProductNamesDumper.setMixin: Module 'xmlDiskSource' has no 'ProductNamesDiskSource' member
removed dead code
Automatic commit of package [spacewalk-backend] release [1.3.25-1].
---
backend/satellite_tools/disk_dumper/dumper.py | 4
backend/satellite_tools/exporter/exporter.py | 478 -----------
backend/satellite_tools/gentree.py | 18
backend/satellite_tools/xmlDiskDumper.py | 13
backend/server/apacheHandler.py | 10
backend/server/handlers/config_mgmt/rhn_config_management.py | 4
backend/server/handlers/sat/__init__.py | 2
backend/server/rhnAction.py | 20
backend/server/rhnDependency.py | 6
backend/server/rhnSQL/driver_postgresql.py | 1
backend/server/rhnSQL/sql_base.py | 2
backend/server/rhnServer/server_kickstart.py | 2
backend/spacewalk-backend.spec | 8
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 30
rel-eng/packages/spacewalk-backend | 2
15 files changed, 63 insertions(+), 537 deletions(-)
---
13 years, 5 months
16 commits - backend/satellite_tools backend/server backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/disk_dumper/dumper.py | 4
backend/satellite_tools/exporter/exporter.py | 478 -----------
backend/satellite_tools/gentree.py | 18
backend/satellite_tools/xmlDiskDumper.py | 13
backend/server/apacheHandler.py | 10
backend/server/handlers/config_mgmt/rhn_config_management.py | 4
backend/server/handlers/sat/__init__.py | 2
backend/server/rhnAction.py | 20
backend/server/rhnDependency.py | 6
backend/server/rhnSQL/driver_postgresql.py | 1
backend/server/rhnSQL/sql_base.py | 2
backend/server/rhnServer/server_kickstart.py | 2
backend/spacewalk-backend.spec | 8
rel-eng/packages/spacewalk-backend | 2
14 files changed, 33 insertions(+), 537 deletions(-)
New commits:
commit 0dc4d483273a8f5cc1cb6d793cad6a1b7c35b998
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 16:05:03 2010 +0100
Automatic commit of package [spacewalk-backend] release [1.3.25-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 1564e96..fc82026 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.3.24
+Version: 1.3.25
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Dec 15 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.25-1
+- removed dead code
+- fixed number of pylint reported errors
+- fixed Module sat doesn't support our API
+- remove block of code from for-loop
+
* Mon Dec 13 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.24-1
- fixed number of errors reported by pylint
- 652852 - delete related RepoData when updating a package
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 1bd1003..3e4c4cf 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.24-1 backend/
+1.3.25-1 backend/
commit 4d58cea34b82ef8fce9c23ef4632f033d35898b3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 11:36:53 2010 +0100
removed dead code
why do I think so:
- this looks like some of the first stubs of ISS exporter
- it calls undefined APIs (e.g. snapshot_channels())
- it calls xmlSource.getHandler() which contain typo so any use ends up
with traceback
diff --git a/backend/satellite_tools/exporter/exporter.py b/backend/satellite_tools/exporter/exporter.py
deleted file mode 100644
index 35bac30..0000000
--- a/backend/satellite_tools/exporter/exporter.py
+++ /dev/null
@@ -1,478 +0,0 @@
-#
-# Copyright (c) 2008--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 sys
-import string
-import urlparse
-from optparse import Option, OptionParser
-
-from spacewalk.common import rhnLib, initCFG
-from spacewalk.satellite_tools import xmlSource, xmlDiskSource, xmlDiskDumper, \
- diskImportLib, connection
-
-def main():
- optionsTable = [
- Option('-s','--server', action='store',
- help="Server to take the dumps from"),
- Option('-m','--mountpoint', action='store',
- help="Mount point for saving data"),
- Option( '--snapshot-tag', action='store',
- help='Use this snapshot tag (for snapshotting or dumping channels'),
- Option( '--incremental', action='store_true',
- help='Incremental channel dump (relative to the snapshot)'),
- Option('-c','--channel', action='append',
- help='Process packages for this channel only'),
- Option('-f','--force', action='store_true',
- help="Force the overwrite of contents"),
- Option( '--blacklists', action='store_true',
- help="Dump blacklists only"),
- Option( '--arches', action='store_true',
- help="Dump arches only"),
- Option( '--channelfamilies', action='store_true',
- help="Dump channel families only"),
- Option( '--snapshot', action='store_true',
- help="Snapshot only"),
- Option( '--no-snapshot', action='store_true',
- help="Do _not_ re-snapshot"),
- Option( '--channels', action='store_true',
- help="Dump channels only"),
- Option( '--shortpackages', action='store_true',
- help="Dump short package information only"),
- Option( '--packages', action='store_true',
- help="Dump package information only"),
- Option( '--source-packages', action='store_true',
- help="Dump source package information only",
- dest="source_packages"),
- Option( '--rpms', action='store_true',
- help="Dump binary rpms"),
- Option( '--srpms', action='store_true',
- help="Dump source rpms"),
- Option( '--errata', action='store_true',
- help="Dump errata only"),
- Option( '--ksdata', action='store_true',
- help='Dump kickstart data only'),
- Option( '--ksfiles', action='store_true',
- help='Dump kickstart files only'),
- ]
- initCFG('server')
- optionParser = OptionParser(option_list=optionsTable)
- options, args = optionParser.parse_args()
-
- if not options.server:
- print "Error: --server not specified"
- return
-
- mountPoint = options.mountpoint
- if not mountPoint:
- print "Error: mount point not specified. Please use -m or --mountpoint"
- return
-
- options.channel = options.channel or all_channels()
-
- # Max compression
- compression = 9
-
- # Figure out which actions to execute
- all_actions = {
- "arches" : None,
- "blacklists" : None,
- "channelfamilies" : None,
- "snapshot" : None,
- "channels" : None,
- "packages" : ["channels", "shortpackages"],
- "shortpackages" : ["channels"],
- "source_packages" : ["channels"],
- "errata" : ["channels"],
- "rpms" : ["channels", "shortpackages"],
- "srpms" : ["channels"],
- "ksdata" : ["channels"],
- "ksfiles" : ["ksdata"],
- }
- # Get the list of actions they've checked
- cmdline_actions = filter(lambda x, options=options: getattr(options, x),
- all_actions.keys())
- if cmdline_actions:
- actions = {}
- while cmdline_actions:
- action = cmdline_actions.pop()
- if actions.has_key(action):
- # We've processed this action already
- continue
- # Add all the actions this one depends upon
- cmdline_actions.extend(all_actions[action] or [])
- actions[action] = all_actions[action]
- else:
- # No action specified, default to all
- actions = all_actions
-
- if (options.incremental or options.no_snapshot) and 'snapshot' in actions:
- # Explicitly required not to snapshot
- del actions['snapshot']
-
- if 'channels' in actions or 'snapshot' in actions:
- # Did we get a snapshot?
- if not options.snapshot_tag:
- print "Error: need to specify a snapshot tag"
- return
-
- dumper = Dumper(options.server, actions, options=options,
- compression=compression)
-
- dumper.init()
- dumper.run()
-
-def all_channels():
- # Default channels
- return [
- 'redhat-linux-i386-9',
- 'redhat-linux-i386-8.0',
- 'redhat-linux-i386-7.3',
- 'redhat-linux-i386-7.2',
- 'redhat-advanced-server-i386',
- 'redhat-ent-linux-i386-es-2.1',
- 'redhat-ent-linux-i386-ws-2.1',
- ]
-
-
-class Dumper:
- buffer_size = 65536
-
- def __init__(self, server_url, actions, compression=9, options=None):
- self.server_url = patch_url(server_url, path="/SAT-DUMP-INTERNAL")
- self.actions = actions
- self.server = None
- self.options = options
- self.compression = compression
-
- def init(self):
- print "Connecting to", self.server_url
- self.server = connection.StreamConnection(self.server_url)
-
- # Run all the actions specified on the command line
- def run(self):
- ordered_actions = self._order_actions()
- # XXX hack - snapshots have to happen before channels
- snp = 'snapshot'
- chn = 'channels'
- if snp in ordered_actions:
- if chn in ordered_actions:
- ordered_actions.remove(snp)
- # Insert snapshot before channels
- ordered_actions.insert(ordered_actions.index(chn), snp)
-
- for action in ordered_actions:
- method = getattr(self, "dump_%s" % action)
- method()
-
- def dump_arches(self):
- print "Dumping arches"
- dumper = xmlDiskDumper.ArchesDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
- dumper.dump(force=self.options.force)
- dumper = xmlDiskDumper.ArchesExtraDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
- dumper.dump(force=self.options.force)
-
- def dump_blacklists(self):
- print "Dumping blacklists"
- dumper = xmlDiskDumper.BlacklistsDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
- dumper.dump(force=self.options.force)
-
- def dump_channelfamilies(self):
- print "Dumping channel families"
- dumper = xmlDiskDumper.ChannelFamilyDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
- dumper.setChannels(self.options.channel or [])
- dumper.dump(force=self.options.force)
-
- def snapshot_channels(self):
- snapshot = self.options.snapshot_tag
- print "Snapshotting using tag '%s'" % snapshot
- channels = self.options.channel or []
- flags = {'force' : 1}
- self.server.dump.snapshot_channels(snapshot, channels, flags)
-
- # XXX This allows not to special-case run() for snapshots
- dump_snapshot = snapshot_channels
-
- def dump_channels(self):
- print "Dumping channels"
- dumper = xmlDiskDumper.ChannelDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
-
- flags = {}
- if self.options.incremental:
- flags['incremental'] = 1
-
- dumper.flags = flags
- dumper.snapshot = self.options.snapshot_tag
-
- for channel in (self.options.channel or []):
- dumper.setChannel(channel)
- dumper.dump(force=self.options.force)
-
- # Loads the required channels from disk (to retrieve package ids and such)
- def _load_channels(self):
- channels = []
- channel_source = xmlDiskSource.ChannelDiskSource(
- self.options.mountpoint)
- handler = xmlSource.SatelliteDispatchHandler()
- channel_container = xmlSource.ChannelContainer()
- handler.set_container(channel_container)
- for channel in (self.options.channel or []):
- # Get the channel stream
- channel_source.setChannel(channel)
-
- stream = channel_source.load()
- handler.process(stream)
- for c in channel_container.batch:
- channels.append(c)
- handler.clear()
- handler.reset()
- return channels
-
- # Load one short package
- def _load_short_package(self, package_id):
- s = xmlDiskSource.ShortPackageDiskSource(self.options.mountpoint)
- s.setID(package_id)
- stream = s.load()
- return xmlDiskDumper.load_short_package(stream)
-
- # Extract the package ids from the channels
- def _get_channel_object_ids(self, channels, object_name):
- object_ids = {}
- for c in channels:
- objs = c.get(object_name)
- for p in (objs or []):
- object_ids[p] = None
- object_ids = object_ids.keys()
- object_ids.sort()
- return object_ids
-
- # special case - errata listed in channels are objects
- def _get_channel_errata(self, channels):
- object_ids = {}
- for c in channels:
- objs = c.get('errata_timestamps')
- for p in (objs or []):
- object_ids[p['id']] = p['last_modified']
- objs = object_ids.items()
- objs.sort()
- return objs
-
- def _get_all_packages(self, channels):
- object_ids = {}
- for c in channels:
- objs = c.get('all-packages')
- if not objs:
- objs = c.get('packages')
- for p in (objs or []):
- object_ids[p] = None
- object_ids = object_ids.keys()
- object_ids.sort()
- return object_ids
-
- def dump_shortpackages(self):
- print "Dumping short packages"
- dumper = xmlDiskDumper.ShortPackageDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
- channels = self._load_channels()
- packages = self._get_all_packages(channels)
- for package in packages:
- print "Dumping short package", package
- dumper.setID(package)
- # We need this information to be accurate, so always force short
- # packages
- ret = dumper.dump(force=1)
- if ret:
- print " Wrote", ret
-
- def dump_packages(self):
- print "Dumping packages"
- dumper = xmlDiskDumper.PackageDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
- channels = self._load_channels()
- packages = self._get_all_packages(channels)
- for package in packages:
- # Load the source package first, to get the timestamp
- p = self._load_short_package(package)
- last_modified = p['last_modified']
- print "Dumping package", package
- dumper.setID(package)
- ret = dumper.dump(force=self.options.force,
- timestamp=last_modified)
- if ret:
- print " Wrote", ret
-
- def dump_source_packages(self):
- print "Dumping source packages"
- dumper = xmlDiskDumper.SourcePackageDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
- channels = self._load_channels()
- packages = self._get_channel_object_ids(channels, 'source-packages')
- for package in packages:
- print "Dumping source package", package
- dumper.setID(package)
- ret = dumper.dump(force=self.options.force)
- if ret:
- print " Wrote", ret
-
- def dump_errata(self):
- print "Dumping errata"
- dumper = xmlDiskDumper.ErrataDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
- channels = self._load_channels()
- errata = self._get_channel_errata(channels)
- for erratum, timestamp in errata:
- print "Dumping errata", erratum
- dumper.setID(erratum)
- ret = dumper.dump(force=self.options.force, timestamp=timestamp)
- if ret:
- print " Wrote", ret
-
- def dump_rpms(self):
- print "Dumping rpms"
- dumper = xmlDiskDumper.BinaryRPMDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
- channels = self._load_channels()
- packages = self._get_channel_object_ids(channels, 'packages')
- for package in packages:
- print "Dumping rpm", package
- p = self._load_short_package(package)
- last_modified = p['last_modified']
- last_modified = rhnLib.timestamp(last_modified)
- dumper.setID(package)
- dumper.set_utime(last_modified)
- dumper.dump(force=self.options.force)
-
- def dump_srpms(self):
- print "Dumping srpms"
- dumper = xmlDiskDumper.SourceRPMDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
- channels = self._load_channels()
- packages = self._get_channel_object_ids(channels, 'source-packages')
- for package in packages:
- print "Dumping srpm", package
- last_modified = package['last_modified']
- last_modified = rhnLib.timestamp(last_modified)
- dumper.setID(package)
- dumper.set_utime(last_modified)
- dumper.dump(force=self.options.force)
-
- # Outputs the actions sorted in a meaningful way (topological sort most of
- # the times)
- def _order_actions(self):
- actions = {}
- depends = {}
- depcount = map(lambda x: {}, self.actions.keys())
- for act, adep in self.actions.items():
- hash = {}
- for d in (adep or []):
- hash[d] = None
-
- # Now mark act as depending on d
- if depends.has_key(d):
- dlist = depends[d]
- else:
- dlist = depends[d] = []
- dlist.append(act)
-
- actions[act] = hash
- # Now update the list of counts
- depcount[len(hash.keys())][act] = None
-
- indep = depcount[0]
- result = []
- while 1:
- if not actions:
- # Done
- break
- if not indep:
- raise Exception, "List cannot be t-sorted"
- act = indep.keys()[0]
- del indep[act]
- # This node no longer depends on anybody
- del actions[act]
- result.append(act)
- # Now update the count for everybody that depends on this one
- if not depends.has_key(act):
- # Nothing to do
- continue
- for d in depends[act]:
- current_dep_count = len(actions[d].keys())
- del depcount[current_dep_count][d]
- del actions[d][act]
- depcount[current_dep_count - 1][d] = None
- del depends[act]
-
- return result
-
- def dump_ksdata(self):
- print "Dumping kickstart data"
- dumper = xmlDiskDumper.KickstartDataDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
-
- channels = self._load_channels()
- ks_labels = self._get_channel_object_ids(channels, 'kickstartable_trees')
-
- for ks_label in ks_labels:
- dumper.setID(ks_label)
- ret = dumper.dump(force=self.options.force)
- if ret:
- print " Wrote", ret
-
- def dump_ksfiles(self):
- print "Dumping kickstart files"
- dumper = xmlDiskDumper.KickstartFilesDumper(self.options.mountpoint,
- server=self.server, compression=self.compression)
-
- # Load data from disk
- handler = xmlSource.getHandler()
-
- channels = self._load_channels()
- ks_labels = self._get_channel_object_ids(channels, 'kickstartable_trees')
- for ks_label in ks_labels:
- ks_tree = diskImportLib.getKickstartTree(
- self.options.mountpoint, ks_label, handler)
- if ks_tree is None:
- continue
-
- dumper.setID(ks_label)
-
- for ks_file in (ks_tree.get('files') or []):
- relative_path = ks_file['relative_path']
- dumper.set_relative_path(relative_path)
- dumper.dump(force=self.options.force)
-
-
-def patch_url(url, scheme='http', path=None):
- _scheme, netloc, _path, params, query, fragment = urlparse.urlparse(url)
- if not netloc:
- # No schema - trying to patch it up ourselves?
- nu = "%s://%s" % (scheme, url)
- _scheme, netloc, _path, params, query, fragment = urlparse.urlparse(nu)
-
- if not netloc:
- raise ValueError("Invalid URL: %s" % url)
- if _path == '' and path is not None:
- _path = path
- if string.lower(_scheme) not in ('http', 'https'):
- raise ValueError("Unknown URL scheme %s" % _scheme)
- return urlparse.urlunparse((_scheme, netloc, _path, params, query,
- fragment))
-
-if __name__ == '__main__':
- sys.exit(main() or 0)
commit 377a38a840955b2373607ef8bf8726c959ec5655
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 11:10:27 2010 +0100
fixed E1101:318:ProductNamesDumper.setMixin: Module 'xmlDiskSource' has no 'ProductNamesDiskSource' member
removed whole dead class
diff --git a/backend/satellite_tools/xmlDiskDumper.py b/backend/satellite_tools/xmlDiskDumper.py
index f1c59cd..1cff200 100644
--- a/backend/satellite_tools/xmlDiskDumper.py
+++ b/backend/satellite_tools/xmlDiskDumper.py
@@ -310,15 +310,6 @@ class BlacklistsDumper(Dumper):
def _getMethod(self):
return self.server.dump.blacklist_obsoletes
-class ProductNamesDumper(Dumper):
-
- def setMixin(self):
- self._mixin = xmlDiskSource.ProductNamesDiskSource(self.mountPoint)
-
- def _getMethod(self):
- return self.server.dump.product_names
-
-
class BinaryRPMDumper(ShortPackageDumper):
_loader_class = None
commit 5f08f22415a9c1b31fbb2adbf95ca28683bb3864
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 11:07:34 2010 +0100
fixed E1101:223:ChannelDumper._getArgs: Instance of 'ChannelDumper' has no 'snapshot' member
E1101:224:ChannelDumper._getArgs: Instance of 'ChannelDumper' has no 'flags' member
diff --git a/backend/satellite_tools/xmlDiskDumper.py b/backend/satellite_tools/xmlDiskDumper.py
index c757e53..f1c59cd 100644
--- a/backend/satellite_tools/xmlDiskDumper.py
+++ b/backend/satellite_tools/xmlDiskDumper.py
@@ -220,9 +220,7 @@ class ChannelDumper(Dumper):
def _getArgs(self):
# Virtual
- snapshot = self.snapshot
- flags = self.flags
- return ([self._mixin.channel], snapshot, flags)
+ return ([self._mixin.channel], )
class ShortPackageDumper(Dumper):
_loader_class = xmlSource.IncompletePackageContainer
commit fa223720f989d16846b282a5cced38c18f3dcf0b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 10:57:00 2010 +0100
fixed E1103:211:main: Instance of 'ChannelDumper' has no 'setID' member (but some types could not be inferred)
E1103:225:main: Instance of 'ChannelDumper' has no 'setID' member (but some types could not be inferred)
diff --git a/backend/satellite_tools/gentree.py b/backend/satellite_tools/gentree.py
index 799a385..41c18f6 100644
--- a/backend/satellite_tools/gentree.py
+++ b/backend/satellite_tools/gentree.py
@@ -203,28 +203,28 @@ def main(arglist):
errata.sort()
errata_source = xmlDiskSource.ErrataDiskSource(mountPoint)
- dumper = xmlDiskDumper.ErrataDumper(destMountPoint, compression=9)
- dumper.prune(errata)
+ edumper = xmlDiskDumper.ErrataDumper(destMountPoint, compression=9)
+ edumper.prune(errata)
for err in errata:
errata_source.setID(err)
stream = errata_source.load()
- dumper.setID(err)
- dumper.setInputStream(stream)
- dumper.dump(force=force)
+ edumper.setID(err)
+ edumper.setInputStream(stream)
+ edumper.dump(force=force)
if "ksdata" in actions:
print "Copying kickstart data: %s" % (channels, )
ksdata_source = xmlDiskSource.KickstartDataDiskSource(mountPoint)
- dumper = xmlDiskDumper.KickstartDataDumper(destMountPoint, compression=9)
+ ksdumper = xmlDiskDumper.KickstartDataDumper(destMountPoint, compression=9)
ks_tree_labels = get_kickstart_labels(mountPoint, channels)
for ks_tree_label in ks_tree_labels:
ksdata_source.setID(ks_tree_label)
stream = ksdata_source.load()
- dumper.setID(ks_tree_label)
- dumper.setInputStream(stream)
- dumper.dump(force=force)
+ ksdumper.setID(ks_tree_label)
+ ksdumper.setInputStream(stream)
+ ksdumper.dump(force=force)
if "ksfiles" in actions:
print "Copying kickstart files: %s" % (channels, )
commit 542b3bbd15d5151c9b757e569c30baa231bc09b1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 10:44:59 2010 +0100
removed dead schedule_server_packages_update()
diff --git a/backend/server/rhnAction.py b/backend/server/rhnAction.py
index eb6e1dc..e2a27f4 100644
--- a/backend/server/rhnAction.py
+++ b/backend/server/rhnAction.py
@@ -127,25 +127,6 @@ def invalidate_action(server_id, action_id):
return a_ids
-_query_schedule_server_packages_update = rhnSQL.Statement("""
- insert into rhnActionPackage (id, action_id, name_id, parameter)
- values (sequence_nextval('rhn_act_p_id_seq'), :action_id, :name_id, 'upgrade')
-""")
-
-def schedule_server_packages_update(server_id, package_ids, org_id = None,
- prerequisite = None, action_name = "Package update"):
- action_id = schedule_server_action(server_id,
- action_type = 'packages.update', action_name = action_name,
- org_id = org_id, prerequisite = prerequisite)
-
- h = rhnSQL.prepare(_query_schedule_server_packages_update)
-
- h.execute_bulk({
- 'action_id' : [action_id] * len(package_ids),
- 'name_id' : package_ids,
- })
- return action_id
-
_query_schedule_server_packages_update_by_arch = rhnSQL.Statement("""
insert into rhnActionPackage (id, action_id, name_id, package_arch_id, \
parameter)
commit c48c3036b4b93a73e0003633e7325723cf011c9a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 10:43:25 2010 +0100
fixed E1111:248:server_token.token_packages: Assigning to function call which doesn't return
diff --git a/backend/server/rhnAction.py b/backend/server/rhnAction.py
index 9afcac8..eb6e1dc 100644
--- a/backend/server/rhnAction.py
+++ b/backend/server/rhnAction.py
@@ -161,4 +161,4 @@ def schedule_server_packages_update_by_arch(server_id, package_arch_ids, org_id
for name_id, arch_id in package_arch_ids:
h.execute(action_id=action_id, name_id=name_id, arch_id=arch_id)
-
+ return action_id
commit b184e86a10cf10cb152d63dac47a150786732bdc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 10:36:36 2010 +0100
fixed E1101:245:XML_Dumper.dump_channel_packages_short: Instance of 'XML_Dumper' has no '_send_headers' member
diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py
index 89ed8b0..ffd658b 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -197,6 +197,10 @@ class XML_Dumper:
channels=channel_labels, start_date=start_date, end_date=end_date)
return 0
+ def _send_headers(self, error=0, init_compressed_stream=1):
+ """to be overwritten in subclass"""
+ pass
+
def dump_channel_packages_short(self, channel_label, last_modified, filepath=None,
validate_channels=False, send_headers=False,
open_stream=True):
commit b652322efe616eccaf1627c8f25c6ebf3bd276e9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 09:13:28 2010 +0100
fixed E0602:100:delete_guests: Undefined variable 'log_error'
E0602:111:delete_guests: Undefined variable 'log_error'
diff --git a/backend/server/rhnServer/server_kickstart.py b/backend/server/rhnServer/server_kickstart.py
index 7defef4..68243ba 100644
--- a/backend/server/rhnServer/server_kickstart.py
+++ b/backend/server/rhnServer/server_kickstart.py
@@ -16,7 +16,7 @@
# Kickstart-related operations
#
-from spacewalk.common import rhnException, rhnFlags, log_debug
+from spacewalk.common import rhnException, rhnFlags, log_debug, log_error
from spacewalk.server import rhnSQL, rhnAction, rhnLib, rhnChannel
def update_kickstart_session(server_id, action_id, action_status,
commit 3e9793a71240483f7d6a8917cecb55301ce9a9f9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 09:11:49 2010 +0100
fixed E1111:248:server_token.token_packages: Assigning to function call which doesn't return
diff --git a/backend/server/rhnAction.py b/backend/server/rhnAction.py
index 1ddff24..9afcac8 100644
--- a/backend/server/rhnAction.py
+++ b/backend/server/rhnAction.py
@@ -144,6 +144,7 @@ def schedule_server_packages_update(server_id, package_ids, org_id = None,
'action_id' : [action_id] * len(package_ids),
'name_id' : package_ids,
})
+ return action_id
_query_schedule_server_packages_update_by_arch = rhnSQL.Statement("""
insert into rhnActionPackage (id, action_id, name_id, package_arch_id, \
commit 054ace73d813ba226c202546d977b358993a1f94
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Dec 14 16:02:25 2010 +0100
fixed E0602:348:Database.function: Undefined variable 'sql_base'
diff --git a/backend/server/rhnSQL/sql_base.py b/backend/server/rhnSQL/sql_base.py
index 225e4d2..ca3692a 100644
--- a/backend/server/rhnSQL/sql_base.py
+++ b/backend/server/rhnSQL/sql_base.py
@@ -345,7 +345,7 @@ class Database:
See cx_Oracle's Cursor.callfunc for more details.
"""
if not isinstance(ret_type, sql_types.DatabaseDataType):
- raise sql_base.SQLError("Invalid return type specified", ret_type)
+ raise SQLError("Invalid return type specified", ret_type)
return self._function(name, ret_type)
def _function(self, name, ret_type):
commit a8fb657b537bd4ce6e68d25a2945b449b2f910d6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Dec 14 15:59:00 2010 +0100
fixed E0602:199:Database.transaction: Undefined variable 'rhnException'
E0602:254:Cursor._execute_wrapper: Undefined variable 'rhnException'
diff --git a/backend/server/rhnSQL/driver_postgresql.py b/backend/server/rhnSQL/driver_postgresql.py
index e2db161..e781b21 100644
--- a/backend/server/rhnSQL/driver_postgresql.py
+++ b/backend/server/rhnSQL/driver_postgresql.py
@@ -27,6 +27,7 @@ from spacewalk.server import rhnSQL
from spacewalk.server.rhnSQL import sql_types
from spacewalk.common import log_debug, log_error, UserDictCase
+from spacewalk.common.rhnException import rhnException
from const import POSTGRESQL
def convert_named_query_params(query):
commit 2363cbf5ba76fc7cca5eb474009f19eca4ffef11
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Dec 14 15:17:50 2010 +0100
fixed E1101:335:make_evr: Class 'rhnException' has no 'rhnFault' member
E1101:700:test_evr: Class 'rhnException' has no 'rhnFault' member
diff --git a/backend/server/rhnDependency.py b/backend/server/rhnDependency.py
index ac86e0a..582090e 100644
--- a/backend/server/rhnDependency.py
+++ b/backend/server/rhnDependency.py
@@ -15,7 +15,7 @@
#
from spacewalk.common import log_debug, log_error
-from spacewalk.common import rhnException
+from spacewalk.common.rhnException import rhnFault
import rhnSQL
import rpm
import string
@@ -332,7 +332,7 @@ def make_evr(nvre):
}
return ret
else:
- raise rhnException.rhnFault(err_code = 21,
+ raise rhnFault(err_code = 21,
err_text = "NVRE is missing name, version, or release.")
elif string.find(nvre, '-') != -1:
nvre = string.split(nvre, '-')
@@ -697,7 +697,7 @@ def test_evr(evr, operator, limit):
good_operators = ['<', '<=', '==', '>=', '>']
if not operator in good_operators:
- raise rhnException.rhnFault(err_code = 21,
+ raise rhnFault(err_code = 21,
err_text = "Bad operator passed into test_evr.")
evr_epoch = evr['epoch']
commit 7181ae406d2d88b744c3d8dc21fe4d35896edf07
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Dec 14 14:43:45 2010 +0100
fixed E1101:120:apacheHandler._init_request_processor: Instance of 'apachePOST' has no 'init_request' member
E1101:135:apacheHandler._cleanup_request_processor: Instance of 'apachePOST' has no 'cleanup_request' member
diff --git a/backend/server/apacheHandler.py b/backend/server/apacheHandler.py
index 93999e7..f57202a 100644
--- a/backend/server/apacheHandler.py
+++ b/backend/server/apacheHandler.py
@@ -113,14 +113,6 @@ class apacheHandler(apacheSession):
log_error("Unable to handle GET request for server %s" %
(e.args[0], ))
return apache.HTTP_METHOD_NOT_ALLOWED
- # We want to give the request processor the ability to override
- # the default behaviour of calling _setSessionToken
- # XXX This is a but kludgy - misa 20040827
- if hasattr(self._req_processor, 'init_request'):
- if not self._req_processor.init_request():
- return apache.HTTP_METHOD_NOT_ALLOWED
- # Request initialized
- return apache.OK
token = self._setSessionToken(req.headers_in)
if token is None:
return apache.HTTP_METHOD_NOT_ALLOWED
@@ -131,8 +123,6 @@ class apacheHandler(apacheSession):
def _cleanup_request_processor(self):
""" Clean up the request processor """
- if hasattr(self._req_processor, 'cleanup_request'):
- self._req_processor.cleanup_request()
self._req_processor = None
return apache.OK
commit fc192c28d70c9eda4d633b4b2f779962ffd50e19
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 13 13:42:00 2010 +0100
fixed E9905:453:ConfigManagement.management_diff: Too many arguments for format string
diff --git a/backend/server/handlers/config_mgmt/rhn_config_management.py b/backend/server/handlers/config_mgmt/rhn_config_management.py
index 5a9931d..985c6f8 100644
--- a/backend/server/handlers/config_mgmt/rhn_config_management.py
+++ b/backend/server/handlers/config_mgmt/rhn_config_management.py
@@ -449,8 +449,8 @@ class ConfigManagement(configFilesHandler.ConfigFilesHandler):
fdst = self._get_file_revision(config_channel_dst, revision_dst, path)
if fsrc['label'] != fdst['label']:
- raise rhnFault(4017, "Path %s is a %s"+ \
- " in channel %s while it is a %s in channel %s"\
+ raise rhnFault(4017,
+ "Path %s is a %s in channel %s while it is a %s in channel %s" \
% (path, fsrc['label'], \
config_channel_src, fdst['label'], config_channel_dst),
explain=0)
commit 89b8ee661d357c3a0d40f10656a8134a1282bb28
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 15 13:58:59 2010 +0100
fixed RHN 27637 2010/12/15 06:16:44 -04:00: ("Module sat doesn't support our API",)
introduced by dead code removal
33a80d3760536742b8179b72907fe4d6a8c5780e
b90be2b435e87d8d65917f4dddf3e758c71855b4
diff --git a/backend/server/handlers/sat/__init__.py b/backend/server/handlers/sat/__init__.py
index c095fee..a16f858 100644
--- a/backend/server/handlers/sat/__init__.py
+++ b/backend/server/handlers/sat/__init__.py
@@ -22,3 +22,5 @@ rpcClasses = {
'authentication' : auth.Authentication,
'certificate' : cert.Certificate,
}
+
+getHandler = None
13 years, 5 months
rel-eng/comps
by jblazek
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 30 +++++++++++++++++++++++++
1 file changed, 30 insertions(+)
New commits:
commit 6e81cc527df2408234d3e0915403906a6895a7b0
Author: Jan Blazek <jblazek(a)redhat.com>
Date: Wed Dec 15 14:31:20 2010 +0100
Add *-javadoc packages to new docs group
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index ae7516e..cfdfbcc 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -213,4 +213,34 @@
<packagereq type="default">xpp3-minimal</packagereq>
</packagelist>
</group>
+ <group>
+ <id>spacewalk-server-docs</id>
+ <name>Spacewalk Server Documentation</name>
+ <description>Spacewalk Server Documentation Packages</description>
+ <uservisible>false</uservisible>
+ <packagelist>
+ <packagereq type="optional">asm-javadoc</packagereq>
+ <packagereq type="optional">bea-stax-javadoc</packagereq>
+ <packagereq type="optional">cglib-javadoc</packagereq>
+ <packagereq type="optional">dom4j-javadoc</packagereq>
+ <packagereq type="optional">hibernate3-javadoc</packagereq>
+ <packagereq type="optional">icu4j-javadoc</packagereq>
+ <packagereq type="optional">isorelax-javadoc</packagereq>
+ <packagereq type="optional">jakarta-commons-cli-javadoc</packagereq>
+ <packagereq type="optional">jakarta-commons-configuration-javadoc</packagereq>
+ <packagereq type="optional">jaxen-javadoc</packagereq>
+ <packagereq type="optional">jcommon-javadoc</packagereq>
+ <packagereq type="optional">msv-javadoc</packagereq>
+ <packagereq type="optional">msv-relames-javadoc</packagereq>
+ <packagereq type="optional">msv-xmlgen-javadoc</packagereq>
+ <packagereq type="optional">msv-xsdlib-javadoc</packagereq>
+ <packagereq type="optional">relaxngDatatype-javadoc</packagereq>
+ <packagereq type="optional">servletapi4-javadoc</packagereq>
+ <packagereq type="optional">tanukiwrapper-javadoc</packagereq>
+ <packagereq type="optional">ws-jaxme-javadoc</packagereq>
+ <packagereq type="optional">xom-javadoc</packagereq>
+ <packagereq type="optional">xpp2-javadoc</packagereq>
+ <packagereq type="optional">xpp3-javadoc</packagereq>
+ </packagelist>
+ </group>
</comps>
13 years, 5 months
Changes to 'refs/tags/spacewalk-web-1.3.14-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.3.14-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-12-15 10:42 +0000
Tagging package [spacewalk-web] version [1.3.14-1] in directory [web/].
Changes since spacewalk-web-1.3.13-1:
Miroslav Suchý (3):
656963 - wrap up run-script using activity
663304 - we do not put alias in INSERTs since commit b950aa91
Automatic commit of package [spacewalk-web] release [1.3.14-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml | 2 ++
web/modules/rhn/RHN/DB/ContactMethod.pm | 2 +-
web/spacewalk-web.spec | 6 +++++-
4 files changed, 9 insertions(+), 3 deletions(-)
---
13 years, 5 months
2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Miroslav Suchý
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/ContactMethod.pm | 2 +-
web/spacewalk-web.spec | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 7c591bdbb6a6ea56faedc45b2a4e3d066b50979f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 15 11:42:38 2010 +0100
Automatic commit of package [spacewalk-web] release [1.3.14-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index a895da4..5c1ff24 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.13-1 web/
+1.3.14-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index f86c41b..a048660 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.13
+Version: 1.3.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Dec 15 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.14-1
+- 663304 - we do not put alias in INSERTs since commit b950aa91
+- 656963 - wrap up run-script using activity
+
* Tue Dec 14 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.13-1
- fixed undefined variable
commit a8ef42bbe7fb6ad9d78710047d933006e3fd9b54
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Dec 15 11:38:47 2010 +0100
663304 - we do not put alias in INSERTs since commit b950aa91
diff --git a/web/modules/rhn/RHN/DB/ContactMethod.pm b/web/modules/rhn/RHN/DB/ContactMethod.pm
index 7b2f6ab..30fdefd 100644
--- a/web/modules/rhn/RHN/DB/ContactMethod.pm
+++ b/web/modules/rhn/RHN/DB/ContactMethod.pm
@@ -210,7 +210,7 @@ sub commit {
else {
$query = get_table->insert_query(get_table->methods_to_columns(@modified));
# adjust the query to update last_update_date
- $query =~ s/\((.*)\) VALUES \((.*)\)/\($1, $table_alias\.last_update_date\) VALUES \($2, SYSDATE\)/;
+ $query =~ s/\((.*)\) VALUES \((.*)\)/\($1, last_update_date\) VALUES \($2, SYSDATE\)/;
}
my $sth = $dbh->prepare($query);
13 years, 5 months
web/html
by Miroslav Suchý
web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 9c5cbcd334d2dfde7df484063e78e731b76dfd6d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Dec 14 21:38:27 2010 +0100
656963 - wrap up run-script using activity
diff --git a/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml b/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml
index 887fb64..e8dbdf0 100644
--- a/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml
+++ b/web/html/applications/rhn-proxy/5.4/install-rhn-proxy.xml
@@ -568,12 +568,14 @@ Would you like to enable Monitoring Proxy functionality on this system?
template="httpd/ssl.conf" mode="644" username="root" groupname="root"/>
</activity>
+ <activity description="Generate jabberd config file">
<run-script acl="global_config(ssl_available);session_data_true(enable_osad)">
<action-name>Generate jabberd config file</action-name>
<script>
/usr/bin/spacewalk-setup-jabberd --macros "hostname:${session.hostname}"
</script>
</run-script>
+ </activity>
<activity description="Activate the ${app.name}">
<method-call class="RHN::ProxyInstall" method="activate_proxy">
13 years, 5 months
Changes to 'refs/tags/spacewalk-web-1.3.13-1'
by Michael Mraka
Tag 'spacewalk-web-1.3.13-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-12-14 13:06 +0000
Tagging package [spacewalk-web] version [1.3.13-1] in directory [web/].
Changes since spacewalk-schema-1.3.5-1:
Jan Pazdziora (1):
636458 - check that the Oracle database instance is version 10 or 11.
Michael Mraka (2):
fixed undefined variable
Automatic commit of package [spacewalk-web] release [1.3.13-1].
---
rel-eng/packages/spacewalk-web | 2 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 7 +++++++
web/modules/dobby/Dobby/DB.pm | 2 +-
web/spacewalk-web.spec | 5 ++++-
4 files changed, 13 insertions(+), 3 deletions(-)
---
13 years, 5 months
rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9ce1c9b756e8ca64a6a20e3b88dbf7ce40c217f5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Dec 14 14:06:09 2010 +0100
Automatic commit of package [spacewalk-web] release [1.3.13-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 22cef9f..a895da4 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.12-1 web/
+1.3.13-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 99e5a3f..f86c41b 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.12
+Version: 1.3.13
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
+* Tue Dec 14 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.13-1
+- fixed undefined variable
+
* Mon Dec 13 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.12-1
- 517455 - adding tablesizes to SYNOPSIS section of db-control man page.
- 617305 - exit value 0 is returned by all db-control commands by default.
13 years, 5 months