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