Changes to 'refs/tags/spacewalk-backend-0.8.21-1'
by Michael Mraka
Tag 'spacewalk-backend-0.8.21-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-01-11 13:22 +0000
Tagging package [spacewalk-backend] version [0.8.21-1] in directory [backend/].
Changes since spacewalk-backend-0.8.20-1:
Michael Mraka (4):
Partial revert of 5137d01d
dumper.py have to import constants
fixed packaging according to constants.py move
Automatic commit of package [spacewalk-backend] release [0.8.21-1].
---
backend/apache-conf/zz-spacewalk-server-python.conf | 12 -----
backend/satellite_exporter/Makefile | 2
backend/satellite_exporter/constants.py | 43 --------------------
backend/satellite_exporter/satexport.py | 2
backend/satellite_tools/Makefile | 2
backend/satellite_tools/connection.py | 2
backend/satellite_tools/constants.py | 43 ++++++++++++++++++++
backend/satellite_tools/disk_dumper/dumper.py | 1
backend/spacewalk-backend.spec | 7 ++-
rel-eng/packages/spacewalk-backend | 2
10 files changed, 56 insertions(+), 60 deletions(-)
---
14 years, 3 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ade6b8267859f5659639ef298ef41347c66d0269
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 11 14:22:36 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.8.21-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8e5a733..72df3ac 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.20
+Version: 0.8.21
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -609,6 +609,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Jan 11 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.21-1
+- fixed satsync -l over ISS
+- fixed failure of httpd to (re)start
* Sat Jan 09 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.20-1
- fixed SHA256 packages import
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 55bbe08..53e135c 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.20-1 backend/
+0.8.21-1 backend/
14 years, 3 months
2 commits - backend/satellite_exporter backend/satellite_tools backend/spacewalk-backend.spec
by Michael Mraka
backend/satellite_exporter/Makefile | 2 -
backend/satellite_exporter/constants.py | 43 --------------------------
backend/satellite_exporter/satexport.py | 2 -
backend/satellite_tools/Makefile | 2 -
backend/satellite_tools/connection.py | 2 -
backend/satellite_tools/constants.py | 43 ++++++++++++++++++++++++++
backend/satellite_tools/disk_dumper/dumper.py | 1
backend/spacewalk-backend.spec | 2 -
8 files changed, 49 insertions(+), 48 deletions(-)
New commits:
commit 19407bb73b43adda9977fad5a4b1124198449dbd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 11 14:16:08 2010 +0100
fixed packaging according to constants.py move
diff --git a/backend/satellite_exporter/Makefile b/backend/satellite_exporter/Makefile
index 2689598..aab2935 100644
--- a/backend/satellite_exporter/Makefile
+++ b/backend/satellite_exporter/Makefile
@@ -4,7 +4,7 @@
CODE_DIRS = handlers
SUBDIR = satellite_exporter
-FILES = __init__ constants satexport
+FILES = __init__ satexport
TOP = ..
diff --git a/backend/satellite_tools/Makefile b/backend/satellite_tools/Makefile
index 352109e..e2d9c4b 100644
--- a/backend/satellite_tools/Makefile
+++ b/backend/satellite_tools/Makefile
@@ -7,7 +7,7 @@ TOP = ..
# Specific stuff
SUBDIR = satellite_tools
SUBDIRS = exporter disk_dumper accounts repo_plugins
-FILES = __init__ connection diskImportLib messages \
+FILES = __init__ connection constants diskImportLib messages \
progress_bar req_channels satCerts satrm satsync syncCache \
sync_handlers rhn-entitlement-report\
syncLib SequenceServer xmlDiskDumper xmlDiskSource \
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c69224d..8e5a733 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -464,7 +464,6 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/satellite_exporter
%{rhnroot}/satellite_exporter/__init__.py*
%{rhnroot}/satellite_exporter/satexport.py*
-%{rhnroot}/satellite_exporter/constants.py*
%dir %{rhnroot}/satellite_exporter/handlers
%{rhnroot}/satellite_exporter/handlers/__init__.py*
@@ -561,6 +560,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{rhnroot}/satellite_tools/xmlWireSource.py*
%{rhnroot}/satellite_tools/updatePackages.py*
%{rhnroot}/satellite_tools/reposync.py*
+%{rhnroot}/satellite_tools/constants.py*
%dir %{rhnroot}/satellite_tools/disk_dumper
%{rhnroot}/satellite_tools/disk_dumper/__init__.py*
%{rhnroot}/satellite_tools/disk_dumper/iss.py*
commit 0c137811205c4a72cc0e0f67fb43c9d8c19c5e45
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 11 14:12:26 2010 +0100
dumper.py have to import constants
constants moved to satellite_tool to simplify package dependencies
diff --git a/backend/satellite_exporter/constants.py b/backend/satellite_exporter/constants.py
deleted file mode 100644
index 5f000b5..0000000
--- a/backend/satellite_exporter/constants.py
+++ /dev/null
@@ -1,43 +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.
-#
-
-"""
-Constant values (protocol versions, etc) for satellite sync/exporter.
-"""
-
-PROTOCOL_VERSION = 3.5
-
-# Support for checksums other then md5
-SHA256_SUPPORTED_VERSION = 3.5
-
-# Support for redirects to CDN (Akamai)
-REDIRECTS_SUPPORTED_VERSION = 3.4
-
-# Support for supplying comps.xml files (package groups)
-COMPS_SUPPORTED_VERSION = 3.3
-
-# Support for update model details (rhn510+)
-EUS_SUPPORTED_VERSION = 3.2
-
-# Support for virt details (rhn500+)
-VIRT_SUPPORTED_VERSION = 3.1
-
-# Historical log
-# * Version 2.2 2004-03-02
-# arch types introduced in all the arch dumps
-# * Version 2.3 2004-09-13
-# added short package dumps per channel
-# * Version 3.0 2005-01-13
-# required major version change for channel family merging (#136525)
-
diff --git a/backend/satellite_exporter/satexport.py b/backend/satellite_exporter/satexport.py
index 8299f02..d4298c9 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -23,7 +23,7 @@ from common import CFG, initCFG, log_debug, log_error, log_setreq, initLOG, \
from common.rhnTranslate import _
from server import rhnSQL, rhnImport
from satellite_tools.disk_dumper.dumper import ClosedConnectionError
-from satellite_exporter import constants
+from satellite_tools import constants
class BaseApacheServer:
def __init__(self):
diff --git a/backend/satellite_tools/connection.py b/backend/satellite_tools/connection.py
index 7672ea6..d029e44 100644
--- a/backend/satellite_tools/connection.py
+++ b/backend/satellite_tools/connection.py
@@ -22,7 +22,7 @@ import string
import gzipstream
from rhn import rpclib
-from satellite_exporter import constants
+from satellite_tools import constants
__version__ = "0.1"
diff --git a/backend/satellite_tools/constants.py b/backend/satellite_tools/constants.py
new file mode 100644
index 0000000..5f000b5
--- /dev/null
+++ b/backend/satellite_tools/constants.py
@@ -0,0 +1,43 @@
+# 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.
+#
+
+"""
+Constant values (protocol versions, etc) for satellite sync/exporter.
+"""
+
+PROTOCOL_VERSION = 3.5
+
+# Support for checksums other then md5
+SHA256_SUPPORTED_VERSION = 3.5
+
+# Support for redirects to CDN (Akamai)
+REDIRECTS_SUPPORTED_VERSION = 3.4
+
+# Support for supplying comps.xml files (package groups)
+COMPS_SUPPORTED_VERSION = 3.3
+
+# Support for update model details (rhn510+)
+EUS_SUPPORTED_VERSION = 3.2
+
+# Support for virt details (rhn500+)
+VIRT_SUPPORTED_VERSION = 3.1
+
+# Historical log
+# * Version 2.2 2004-03-02
+# arch types introduced in all the arch dumps
+# * Version 2.3 2004-09-13
+# added short package dumps per channel
+# * Version 3.0 2005-01-13
+# required major version change for channel family merging (#136525)
+
diff --git a/backend/satellite_tools/disk_dumper/dumper.py b/backend/satellite_tools/disk_dumper/dumper.py
index 3ab2101..dd4b661 100644
--- a/backend/satellite_tools/disk_dumper/dumper.py
+++ b/backend/satellite_tools/disk_dumper/dumper.py
@@ -25,6 +25,7 @@ from cStringIO import StringIO
from common import log_debug, log_error, rhnFault, UserDictCase, rhnCache, \
CFG, rhnLib
from server import rhnSQL, rhnDatabaseCache
+from satellite_tools import constants
from satellite_tools.exporter import exportLib, xmlWriter
from string_buffer import StringBuffer
14 years, 3 months
backend/apache-conf
by Michael Mraka
backend/apache-conf/zz-spacewalk-server-python.conf | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 78e8579d9ccf819755716ba87d4b2f2bcd76e4ee
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 11 11:24:03 2010 +0100
Partial revert of 5137d01d
fixed Starting httpd: httpd: Syntax error on line 210 of
/etc/httpd/conf/httpd.conf: Syntax error on line 22 of
/etc/httpd/conf.d/zz-spacewalk-server-python.conf: Could not open
configuration file /etc/rhn/satellite-httpd/conf/rhn/pkg-upload.conf: No
such file or directory
diff --git a/backend/apache-conf/zz-spacewalk-server-python.conf b/backend/apache-conf/zz-spacewalk-server-python.conf
index 3690c02..fd5f751 100644
--- a/backend/apache-conf/zz-spacewalk-server-python.conf
+++ b/backend/apache-conf/zz-spacewalk-server-python.conf
@@ -14,15 +14,7 @@ PythonInterpreter rhn.server
PythonOption RootDir /usr/share/rhn
-Include /etc/rhn/satellite-httpd/conf/rhn/app.conf
-Include /etc/rhn/satellite-httpd/conf/rhn/applet.conf
-Include /etc/rhn/satellite-httpd/conf/rhn/config-management.conf
-Include /etc/rhn/satellite-httpd/conf/rhn/config-management-tool.conf
-Include /etc/rhn/satellite-httpd/conf/rhn/package-push.conf
-Include /etc/rhn/satellite-httpd/conf/rhn/pkg-upload.conf
-Include /etc/rhn/satellite-httpd/conf/rhn/sat.conf
-Include /etc/rhn/satellite-httpd/conf/rhn/sat-export-internal.conf
-Include /etc/rhn/satellite-httpd/conf/rhn/xmlrpc.conf
-Include /etc/rhn/satellite-httpd/conf/rhn/xp.conf
+# We have to use wildcard here becuse some config files are optional
+Include /etc/rhn/satellite-httpd/conf/rhn/*.conf
14 years, 3 months
Changes to 'refs/tags/spacewalk-backend-0.8.20-1'
by Michael Mraka
Tag 'spacewalk-backend-0.8.20-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-01-08 23:57 +0000
Tagging package [spacewalk-backend] version [0.8.20-1] in directory [backend/].
Changes since spacewalk-java-0.8.5-1:
Jan Pazdziora (2):
Add use RHN::Cleansers which seems to be needed.
If we do not send an email, we should be nice and at least make a note of that in the log.
Justin Sherrill (1):
553262 - fixing issue where kickstart label wasnt printed on software profile page
Michael Mraka (10):
one more forgotten checksum tuple
moved md5sum->checksum transofmation from IncompletePackageItem to BaseItem
moved filedigest handling into rpmFile
one more forgotten checksum tuple
directories and links were missing in file list
Revert "moved md5sum->checksum transofmation from IncompletePackageItem to BaseItem"
handling of md5sum in KickstartFile moved to xml parsing part
fixed rpm*File import from old dumps
added apache.py to specfile
Automatic commit of package [spacewalk-backend] release [0.8.20-1].
---
backend/satellite_tools/satsync.py | 3 -
backend/satellite_tools/xmlSource.py | 17 ++++++++++
backend/server/Makefile | 2 -
backend/server/handlers/app/packages.py | 4 +-
backend/server/importlib/headerSource.py | 7 +++-
backend/server/importlib/packageImport.py | 8 ----
backend/server/importlib/test/test_solaris.py | 3 +
backend/spacewalk-backend.spec | 6 ++-
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java | 2 -
rel-eng/packages/spacewalk-backend | 2 -
web/modules/pxt/PXT/Request.pm | 1
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 2 -
web/modules/rhn/RHN/Mail.pm | 1
13 files changed, 39 insertions(+), 19 deletions(-)
---
14 years, 4 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit fe8cff7f45e68fe59a24e1c1fd86bcc604ca13a7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sat Jan 9 00:57:39 2010 +0100
Automatic commit of package [spacewalk-backend] release [0.8.20-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 7d52d4a..c69224d 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.19
+Version: 0.8.20
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -609,6 +609,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Sat Jan 09 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.20-1
+- fixed SHA256 packages import
+
* Fri Jan 08 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.19-1
- fixed rhnpush and satellite-sync sha256 errors
- adding wsgi support adapter and removing code dependence on mod_python
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 7a63dfb..55bbe08 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.19-1 backend/
+0.8.20-1 backend/
14 years, 4 months
9 commits - backend/satellite_tools backend/server backend/spacewalk-backend.spec web/modules
by Michael Mraka
backend/satellite_tools/satsync.py | 3 --
backend/satellite_tools/xmlSource.py | 17 ++++++++++++++
backend/server/Makefile | 2 -
backend/server/handlers/app/packages.py | 4 ++-
backend/server/importlib/headerSource.py | 7 ++++-
backend/server/importlib/packageImport.py | 8 ------
backend/server/importlib/test/test_solaris.py | 3 +-
backend/spacewalk-backend.spec | 1
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 2 -
9 files changed, 31 insertions(+), 16 deletions(-)
New commits:
commit 4ab9be8003b04976fbef05789bc4ca3338945956
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sat Jan 9 00:49:39 2010 +0100
added apache.py to specfile
diff --git a/backend/server/Makefile b/backend/server/Makefile
index 1f91e5f..f94f387 100644
--- a/backend/server/Makefile
+++ b/backend/server/Makefile
@@ -9,7 +9,7 @@ TOP = ..
SUBDIR = server
FILES = __init__ \
apacheServer apacheHandler apacheAuth apacheRequest \
- apacheUploadServer \
+ apache apacheUploadServer \
byterange \
configFilesHandler \
rhnAuthPAM rhnCapability rhnChannel rhnDatabaseCache \
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 8c6d9b8..7d52d4a 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -337,6 +337,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%files server
%defattr(-,root,root)
# modules
+%{rhnroot}/server/apache.py*
%{rhnroot}/server/apacheAuth.py*
%{rhnroot}/server/apacheHandler.py*
%{rhnroot}/server/apacheRequest.py*
commit 82fd3605f72f09f095c266fec5e4e9340444b6a6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sat Jan 9 00:10:21 2010 +0100
fixed rpm*File import from old dumps
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 9362589..d34ac1e 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -613,6 +613,15 @@ class FileItem(BaseItem):
'rhn-package-file-verifyflags': 'verifyflags',
'rhn-package-file-lang' : 'lang',
}
+ def populate(self, attributes, elements):
+ item = BaseItem.populate(self, attributes, elements)
+ if 'md5' in item:
+ # xml dumps < 3.5 (pre-sha256)
+ # if md5 is empty set empty checksum - e.g. for dirs and links
+ item['checksum_type'] = 'md5'
+ item['checksum'] = item['md5']
+ del(item['md5'])
+ return item
addItem(FileItem)
class DistItem(BaseItem):
commit 82c5fbe87f9c5bb3fd84a27d8cec1ca5e24e852d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Sat Jan 9 00:02:13 2010 +0100
handling of md5sum in KickstartFile moved to xml parsing part
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index a100e31..10caff1 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1423,9 +1423,6 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
relative_path = f['relative_path']
dest_path = os.path.join(base_path, relative_path)
timestamp = rhnLib.timestamp(f['last_modified'])
- if 'md5sum' in f: # old pre-sha256 kickstart export
- f['checksum_type'] = 'md5'
- f['checksum'] = f['md5sum']
file_size = f['file_size']
(errcode, ret_path) = self._verify_file(dest_path,
timestamp, file_size, f['checksum_type'], f['checksum'])
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index bcbda5b..9362589 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -739,6 +739,14 @@ class KickstartFileItem(BaseItem):
'file-size' : 'file_size',
'last-modified' : 'last_modified',
}
+ def populate(self, attributes, elements):
+ item = BaseItem.populate(self, attributes, elements)
+ if item['md5sum']:
+ # xml dumps < 3.5 (pre-sha256)
+ item['checksum_type'] = 'md5'
+ item['checksum'] = item['md5sum']
+ del(item['md5sum'])
+ return item
addItem(KickstartFileItem)
#
commit c15c2f2c09e201f5e24bb4edea3b81a52cd3550d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 8 23:57:14 2010 +0100
Revert "moved md5sum->checksum transofmation from IncompletePackageItem to BaseItem"
This reverts commit 958ed16f5b2cd8ab3608b803aad2fc9379275ec8.
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 10caff1..a100e31 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1423,6 +1423,9 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
relative_path = f['relative_path']
dest_path = os.path.join(base_path, relative_path)
timestamp = rhnLib.timestamp(f['last_modified'])
+ if 'md5sum' in f: # old pre-sha256 kickstart export
+ f['checksum_type'] = 'md5'
+ f['checksum'] = f['md5sum']
file_size = f['file_size']
(errcode, ret_path) = self._verify_file(dest_path,
timestamp, file_size, f['checksum_type'], f['checksum'])
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index d390726..bcbda5b 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -289,13 +289,6 @@ class BaseItem:
self.populateFromAttributes(item, attributes)
# Populate the item from sub-elements
self.populateFromElements(item, elements)
-
- if 'md5sum' in item:
- if item['md5sum']:
- # xml dumps < 3.5 (pre-sha256)
- item['checksum_type'] = 'md5'
- item['checksum'] = item['md5sum']
- del(item['md5sum'])
return item
@@ -484,6 +477,15 @@ class IncompletePackageItem(BaseItem):
'org-id' : 'org_id',
'checksum-type' : 'checksum_type', # xml dump 3.5 (sha256)
}
+
+ def populate(self, attributes, elements):
+ item = BaseItem.populate(self, attributes, elements)
+ if item['md5sum']:
+ # xml dumps < 3.5 (pre-sha256)
+ item['checksum_type'] = 'md5'
+ item['checksum'] = item['md5sum']
+ del(item['md5sum'])
+ return item
addItem(IncompletePackageItem)
class PackageItem(IncompletePackageItem):
commit 1df4bd1ebbd6b8670d0c81379adad790cdf9c0f9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 8 23:51:43 2010 +0100
directories and links were missing in file list
because the have checksum_id = NULL
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index b30ed2c..cfe388b 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -113,7 +113,7 @@ SELECT C.name,
rhnChecksumView Cs
WHERE F.package_id = :pid
AND F.capability_id = C.id
- AND CS.id = F.checksum_id
+ AND CS.id (+) = F.checksum_id
ORDER BY UPPER(C.name)
</query>
</mode>
commit 213aa470e238e3c55e2e9ec92ed24a208e441ce2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 8 14:54:34 2010 +0100
one more forgotten checksum tuple
diff --git a/backend/server/importlib/test/test_solaris.py b/backend/server/importlib/test/test_solaris.py
index a46bf8e..33d9c76 100644
--- a/backend/server/importlib/test/test_solaris.py
+++ b/backend/server/importlib/test/test_solaris.py
@@ -242,7 +242,8 @@ solaris_patch_sets = [
'version': '20050323',
},
size=1024,
- chekcsum=('md5','somecrap'),
+ checksum_type='md5',
+ checksum='somecrap',
path='/dev/null',
org_id=1,
channels=['solaris']
commit 0e189de90d11e55557e018d2ba4708bb21490dea
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 8 14:49:20 2010 +0100
moved filedigest handling into rpmFile
diff --git a/backend/server/importlib/headerSource.py b/backend/server/importlib/headerSource.py
index 2504bee..be39b30 100644
--- a/backend/server/importlib/headerSource.py
+++ b/backend/server/importlib/headerSource.py
@@ -23,7 +23,7 @@ import string
from importLib import File, Dependency, ChangeLog, Channel, \
IncompletePackage, Package, SourcePackage
from backendLib import gmtime, localtime
-from types import ListType, TupleType, IntType
+from types import ListType, TupleType, IntType, StringType
from common import log_debug
from spacewalk.common.checksum import getFileChecksum
@@ -229,6 +229,8 @@ class rpmBinaryPackage(Package, rpmPackage):
# duplicate dep, ignore
continue
else:
+ if tag == 'files':
+ hash['checksum_type'] = self['checksum_type']
obj.populate(hash)
self[tag].append(obj)
@@ -301,6 +303,9 @@ class rpmFile(File, ChangeLog):
if tm is not None and isinstance(tm, IntType):
# A UNIX timestamp
self['mtime'] = gmtime(tm)
+ if type(self['filedigest']) == StringType:
+ self['checksum'] = self['filedigest']
+ del(self['filedigest'])
class rpmProvides(Dependency):
# More mappings
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index 33bf6c1..c6a5b1e 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -259,14 +259,6 @@ class PackageImport(ChannelPackageSubscription):
f['capability'] = nv
if not self.capabilities.has_key(nv):
self.capabilities[nv] = None
- if type(f['md5']) == StringType:
- # xml dumps < 3.5 (pre-sha256)
- f['checksum_type'] = 'md5'
- f['checksum'] = f['md5']
- elif type(f['filedigest']) == StringType:
- # import via spacewalk-repo-sync
- f['checksum_type'] = package['checksum_type']
- f['checksum'] = f['filedigest']
fchecksumTuple = (f['checksum_type'], f['checksum'])
if not self.checksums.has_key(fchecksumTuple):
self.checksums[fchecksumTuple] = None
commit 2b123e33ea0070ced515b77a431c9d5ec54692fa
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 8 12:27:04 2010 +0100
moved md5sum->checksum transofmation from IncompletePackageItem to BaseItem
which allowed removing similar code from KickstartFile sync handler
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index a100e31..10caff1 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -1423,9 +1423,6 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
relative_path = f['relative_path']
dest_path = os.path.join(base_path, relative_path)
timestamp = rhnLib.timestamp(f['last_modified'])
- if 'md5sum' in f: # old pre-sha256 kickstart export
- f['checksum_type'] = 'md5'
- f['checksum'] = f['md5sum']
file_size = f['file_size']
(errcode, ret_path) = self._verify_file(dest_path,
timestamp, file_size, f['checksum_type'], f['checksum'])
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index bcbda5b..d390726 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -289,6 +289,13 @@ class BaseItem:
self.populateFromAttributes(item, attributes)
# Populate the item from sub-elements
self.populateFromElements(item, elements)
+
+ if 'md5sum' in item:
+ if item['md5sum']:
+ # xml dumps < 3.5 (pre-sha256)
+ item['checksum_type'] = 'md5'
+ item['checksum'] = item['md5sum']
+ del(item['md5sum'])
return item
@@ -477,15 +484,6 @@ class IncompletePackageItem(BaseItem):
'org-id' : 'org_id',
'checksum-type' : 'checksum_type', # xml dump 3.5 (sha256)
}
-
- def populate(self, attributes, elements):
- item = BaseItem.populate(self, attributes, elements)
- if item['md5sum']:
- # xml dumps < 3.5 (pre-sha256)
- item['checksum_type'] = 'md5'
- item['checksum'] = item['md5sum']
- del(item['md5sum'])
- return item
addItem(IncompletePackageItem)
class PackageItem(IncompletePackageItem):
commit 1561ae057eb71452747224e6f3c20c2d6544749d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jan 8 11:58:04 2010 +0100
one more forgotten checksum tuple
fixed pushing packages via old rhnpush:
While running 'packages.getPackageMD5sumBySession': caught
exceptions.KeyError : 'checksum_type'
diff --git a/backend/server/handlers/app/packages.py b/backend/server/handlers/app/packages.py
index 2a24b63..b95f866 100644
--- a/backend/server/handlers/app/packages.py
+++ b/backend/server/handlers/app/packages.py
@@ -574,7 +574,9 @@ class Packages(RPC_Base):
pkg_infos = info.get('packages')
for pkg in pkg_infos.keys():
if pkg_infos[pkg].has_key('md5sum'):
- pkg_infos[pkg]['checksum'] = ('md5', pkg_infos[pkg]['md5sum'])
+ pkg_infos[pkg]['checksum_type'] = 'md5'
+ pkg_infos[pkg]['checksum'] = pkg_infos[pkg]['md5sum']
+ del(pkg_infos[pkg]['md5sum'])
def _Checksum2MD5sum_list(self, checksum_list):
log_debug(5)
14 years, 4 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f39b0d97e03eb7e95ba478929fbe652da5a68eb1
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Jan 8 16:17:12 2010 -0500
553262 - fixing issue where kickstart label wasnt printed on software profile page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java
index bcf5302..b4b2f64 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartPackageProfileSetupAction.java
@@ -63,7 +63,7 @@ public class KickstartPackageProfileSetupAction extends RhnAction implements Lis
KickstartData ks = KickstartFactory.lookupKickstartDataByIdAndOrg(
context.getCurrentUser().getOrg(), context.getRequiredParam("ksid"));
-
+ request.setAttribute(RequestContext.KICKSTART, ks);
ListHelper helper = new ListHelper(this, request);
helper.execute();
14 years, 4 months
2 commits - web/modules
by Jan Pazdziora
web/modules/pxt/PXT/Request.pm | 1 +
web/modules/rhn/RHN/Mail.pm | 1 +
2 files changed, 2 insertions(+)
New commits:
commit 1b1d61819abd28eb5554b01af87e998e66f6d52e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 8 15:44:16 2010 +0100
If we do not send an email, we should be nice and at least make a note of that in the log.
diff --git a/web/modules/rhn/RHN/Mail.pm b/web/modules/rhn/RHN/Mail.pm
index 38cbbc2..3fe80a9 100644
--- a/web/modules/rhn/RHN/Mail.pm
+++ b/web/modules/rhn/RHN/Mail.pm
@@ -77,6 +77,7 @@ sub send {
# make sure everyone who should get this message is allowed to
if (not $params{allow_all_domains}) {
unless ($class->validate_allowed_recipients(grep {$_} ($params{to}, $params{cc}, $params{bcc}))) {
+ warn "Recipients ($params{to}, $params{cc}, $params{bcc}) failed validate_allowed_recipients check, mail not sent.\n";
return;
}
}
commit 258ba55d1f08efe61cfc7e3b1dea1a79f091e5ba
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 8 15:29:44 2010 +0100
Add use RHN::Cleansers which seems to be needed.
Addressing
Can't locate object method "securable_param" via package "RHN::Cleansers" (perhaps you forgot to load "RHN::Cleansers"?) at /usr/lib/perl5/vendor_perl/5.8.8/PXT/Request.pm line 326.
diff --git a/web/modules/pxt/PXT/Request.pm b/web/modules/pxt/PXT/Request.pm
index f62e605..d25bab2 100644
--- a/web/modules/pxt/PXT/Request.pm
+++ b/web/modules/pxt/PXT/Request.pm
@@ -25,6 +25,7 @@ use RHN::StoredMessage;
use PXT::Trace;
use PXT::XmlrpcRequest;
use PXT::SoapRequest;
+use RHN::Cleansers ();
use Carp qw/cluck confess/;
use Data::Dumper;
14 years, 4 months
Changes to 'refs/tags/spacewalk-java-0.8.5-1'
by Justin Sherrill
Tag 'spacewalk-java-0.8.5-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-01-08 16:28 +0000
Tagging package [spacewalk-java] version [0.8.5-1] in directory [java/].
Changes since rhn-custom-info-5.4.1-1:
Justin Sherrill (3):
552900 - fixing issue where variables would have a newline on the end
553265 - fixing issue where stored profile list wasnt sorted by name
Automatic commit of package [spacewalk-java] release [0.8.5-1].
---
java/code/src/com/redhat/rhn/common/util/StringUtil.java | 2 -
java/code/src/com/redhat/rhn/domain/rhnpackage/profile/Profile.hbm.xml | 2 -
java/spacewalk-java.spec | 15 +++++++++-
rel-eng/packages/spacewalk-java | 2 -
4 files changed, 17 insertions(+), 4 deletions(-)
---
14 years, 4 months