backend/common/__init__.py | 2 -
backend/common/rhnTB.py | 4 --
backend/server/importlib/headerSource.py | 37 ---------------------
backend/server/rhnChannel.py | 39 -----------------------
backend/server/rhnServer/server_class.py | 8 ----
backend/server/rhnServer/server_lib.py | 7 ----
backend/server/test/misc_functions.py | 25 --------------
backend/server/test/unit-test/test_rhnChannel.py | 33 -------------------
8 files changed, 1 insertion(+), 154 deletions(-)
New commits:
commit 2ce39c6df500f47a5cc01b61b7a67f5cc4bf96a4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:17:31 2011 +0100
removed dead function check_with_seclist()
diff --git a/backend/common/__init__.py b/backend/common/__init__.py
index aa29c1d..fa51f51 100644
--- a/backend/common/__init__.py
+++ b/backend/common/__init__.py
@@ -20,7 +20,7 @@
from UserDictCase import UserDictCase
from RPC_Base import RPC_Base
from rhnException import rhnFault, rhnException, xmlrpclib, redirectException
-from rhnTB import Traceback, fetchTraceback, exitWithTraceback, add_to_seclist,
check_with_seclist, get_seclist
+from rhnTB import Traceback, fetchTraceback, exitWithTraceback, add_to_seclist,
get_seclist
from rhnConfig import CFG, initCFG
# try to figure out if we're running under Apache or not
diff --git a/backend/common/rhnTB.py b/backend/common/rhnTB.py
index 7f9f53d..8642d61 100644
--- a/backend/common/rhnTB.py
+++ b/backend/common/rhnTB.py
@@ -231,7 +231,3 @@ def add_to_seclist(obj):
if not seclist.check(obj):
seclist.add(obj)
-def check_with_seclist(obj):
- """ Checks whether a string is in seclist.sec or not. Returns True or
False. """
- seclist = SecurityList()
- return seclist.check(obj)
commit e9e4c6e18a3497834c2bb846164a23210079cd20
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:34:49 2011 +0100
_populateFromFile() is dead after populateFromFile() removal
diff --git a/backend/server/importlib/headerSource.py
b/backend/server/importlib/headerSource.py
index 469f367..92e63d4 100644
--- a/backend/server/importlib/headerSource.py
+++ b/backend/server/importlib/headerSource.py
@@ -94,26 +94,6 @@ class rpmPackage(IncompletePackage):
self['payload_size'] = 0
return self
- def _populateFromFile(self, f_path, relpath=None, org_id=None, channels=[],
- source=None):
- f_obj = file(f_path)
- import server.rhnPackageUpload as rhnPackageUpload
- header, payload_stream, header_start, header_end = \
- rhnPackageUpload.load_package(f_obj)
- if (source and not header.is_source) or (not source and header.is_source):
- raise ValueError("Unexpected RPM package type")
-
- # Get the size
- size = os.path.getsize(f_path)
- path = None
- if relpath:
- # Strip trailing slashes
- path = "%s/%s" % (sanitizePath(relpath), os.path.basename(f_path))
- checksum_type = header.checksum_type()
- checksum = getFileChecksum(header.checksum_type(), file=payload_stream)
- self.populate(header, size, checksum_type, checksum, path, org_id,
- header_start, header_end, channels)
-
class rpmBinaryPackage(Package, rpmPackage):
# Various mappings
tagMap = rpmPackage.tagMap.copy()
commit f61551b9f0cc9fffae886c99b031f0cf2b23c715
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:34:49 2011 +0100
populateFromFile is dead after createPackageFromFile() removal
diff --git a/backend/server/importlib/headerSource.py
b/backend/server/importlib/headerSource.py
index 677b7b1..469f367 100644
--- a/backend/server/importlib/headerSource.py
+++ b/backend/server/importlib/headerSource.py
@@ -161,9 +161,6 @@ class rpmBinaryPackage(Package, rpmPackage):
# Channels
self._populateChannels(channels)
- def populateFromFile(self, file, relpath=None, org_id=None, channels=[]):
- return self._populateFromFile(file, relpath, org_id, channels)
-
def _populateFiles(self, header):
self._populateTag(header, 'files', rpmFile)
@@ -283,9 +280,6 @@ class rpmSourcePackage(SourcePackage, rpmPackage):
self['sigchecksum'] = string.join(
map(lambda x: "%02x" % ord(x), self['sigchecksum']),
'')
- def populateFromFile(self, file, relpath=None, org_id=None, channels=[]):
- return self._populateFromFile(file, relpath, org_id, channels, source=1)
-
class rpmFile(File, ChangeLog):
# Mapping from the attribute's names to rpm tags
tagMap = {
commit 0ffd09b60896eb7b277d36cbb0c718a2da05e8e0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:11:05 2011 +0100
removed test for already removed createPackageFromFil()
diff --git a/backend/server/test/misc_functions.py
b/backend/server/test/misc_functions.py
index b801422..19abd31 100644
--- a/backend/server/test/misc_functions.py
+++ b/backend/server/test/misc_functions.py
@@ -183,31 +183,6 @@ def listdir(directory):
packageList.append("%s/%s" % (directory, f))
return packageList
-def upload_packages( channel_label, directory, org_id = None, username = None, password =
None, source = 0 ):
- #1. Get a list of packages
- filelist = listdir(directory)
- package_list = []
-
- package_from_file = server.importlib.headerSource.createPackageFromFile
- package_import = server.importlib.packageImport.packageImporter
-
- oracle_backend = server.importlib.backendOracle.OracleBackend()
- oracle_backend.init()
-
- #2. Turn them into package objects.
- for file in filelist:
- try:
- package = package_from_file( os.path.join( directory, file ), None, org_id,
[channel_label], source = source )
- package_list.append(package)
- except:
- print file
- raise
-
- p = package_import( package_list, oracle_backend, source = source )
- p.run()
- if source == 0:
- p.subscribeToChannels()
-
#stolen from backend/server/test/unit-test/test_rhnChannel
def new_channel_dict( **kwargs):
_counter = 0
commit 366712626dbfc9120257dfec81063429be7fd4dc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:17:31 2011 +0100
removed dead function createPackageFromFile()
diff --git a/backend/server/importlib/headerSource.py
b/backend/server/importlib/headerSource.py
index 552e121..677b7b1 100644
--- a/backend/server/importlib/headerSource.py
+++ b/backend/server/importlib/headerSource.py
@@ -405,14 +405,3 @@ def createPackage(header, size, checksum_type, checksum, relpath,
org_id, header
channels)
return p
-def createPackageFromFile(filePath, relpath, org_id, channels, source=0):
- """
- Returns a populated instance of rpmBinaryPackage or rpmSourcePackage
- """
- if source:
- p = rpmSourcePackage()
- else:
- p = rpmBinaryPackage()
-
- p.populateFromFile(filePath, relpath, org_id, channels)
- return p
commit 4b9bca4fe10a1d6ceaafb851cbd44af3389f33f9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:11:05 2011 +0100
removed test for already removed create_channel_families()
diff --git a/backend/server/test/unit-test/test_rhnChannel.py
b/backend/server/test/unit-test/test_rhnChannel.py
index cd02ea8..37d9aaa 100644
--- a/backend/server/test/unit-test/test_rhnChannel.py
+++ b/backend/server/test/unit-test/test_rhnChannel.py
@@ -123,21 +123,6 @@ class Tests(unittest.TestCase):
rhnSQL.commit()
return c
- def test_create_channel_families_1(self):
- """Tests rhnChannel.create_channel_families"""
- entries = []
- for i in range(5):
- vdict = self._new_channel_family_dict()
- entries.append(vdict)
-
- rhnChannel.create_channel_families(entries)
- rhnSQL.commit()
- for entry in entries:
- label = entry['label']
- c = rhnChannel.Channel().load_by_label(label)
- self.failIf(c.exists())
- return entries
-
def test_list_channel_families_1(self):
"""Tests rhnChannel.list_channel_families"""
channel_families = rhnChannel.list_channel_families()
commit b943f1ab7301fa64cf8d9de9e30f7fd16332ca5e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:17:31 2011 +0100
removed dead function create_channel_families()
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index 5c80b2e..8ca0610 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -509,23 +509,6 @@ class ChannelFamily(BaseChannelObject):
_generic_fields = ['label', 'name', 'product_url']
-def create_channel_families(entries, update=0):
- if not isinstance(entries, ListType):
- raise InvalidEntryError(entries, "Not a list")
- mandatory_fields = ChannelFamily._generic_fields
- for e in entries:
- if not isinstance(e, DictType):
- raise InvalidEntryError(e, "Entry is not a dictionary")
-
- for f in mandatory_fields:
- if not e.has_key(f):
- raise InvalidEntryError(e, "Missing required field %s" % f)
-
- c = ChannelFamily()
- c.load_from_dict(e)
- c.save(with_updates=update)
-
-
def _load_by_id(query, item_object, pattern=None):
if pattern:
query += "and label like :pattern"
commit b81fef85bbe7814dabf4de01349a9096a8535ab9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:11:05 2011 +0100
removed test for already removed create_channels()
diff --git a/backend/server/test/unit-test/test_rhnChannel.py
b/backend/server/test/unit-test/test_rhnChannel.py
index 41e0e7e..cd02ea8 100644
--- a/backend/server/test/unit-test/test_rhnChannel.py
+++ b/backend/server/test/unit-test/test_rhnChannel.py
@@ -123,24 +123,6 @@ class Tests(unittest.TestCase):
rhnSQL.commit()
return c
- def test_create_channels_1(self):
- """Tests rhnChannel.create_channels"""
- vdict = self._new_channel_family_dict()
- cf = rhnChannel.ChannelFamily()
- cf.load_from_dict(vdict)
- cf.save()
-
- cf_label = cf.get_label()
-
- entries = []
- for i in range(5):
- vdict = self._new_channel_dict(channel_family=cf_label)
- entries.append(vdict)
-
- rhnChannel.create_channels(entries)
- rhnSQL.commit()
- return entries
-
def test_create_channel_families_1(self):
"""Tests rhnChannel.create_channel_families"""
entries = []
commit 5ff3794b9ca79e31efb29aa4000bd877981dedd8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:17:31 2011 +0100
removed dead function create_channels()
diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py
index 4fa1992..5c80b2e 100644
--- a/backend/server/rhnChannel.py
+++ b/backend/server/rhnChannel.py
@@ -509,28 +509,6 @@ class ChannelFamily(BaseChannelObject):
_generic_fields = ['label', 'name', 'product_url']
-def create_channels(entries, update=0):
- if not isinstance(entries, ListType):
- raise InvalidEntryError(entries, "Not a list")
- mandatory_fields = Channel._generic_fields + ['channel_arch']
- for e in entries:
- if not isinstance(e, DictType):
- raise InvalidEntryError(e, "Entry is not a dictionary")
-
- for f in mandatory_fields:
- if not e.has_key(f):
- raise InvalidEntryError(e, "Missing required field %s" % f)
-
- parent_channel = e.get('parent_channel')
- release = e.get('release')
- if parent_channel and not release:
- raise InvalidEntryError(e, "Attempting to create a base channel "
- "without a distribution release")
-
- c = Channel()
- c.load_from_dict(e)
- c.save(with_updates=update)
-
def create_channel_families(entries, update=0):
if not isinstance(entries, ListType):
raise InvalidEntryError(entries, "Not a list")
commit 3028e30d12750b6b3d70e88a5a04ad748de0d1da
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 25 14:17:31 2011 +0100
removed dead function dbiDate2timestamp()
diff --git a/backend/server/rhnServer/server_class.py
b/backend/server/rhnServer/server_class.py
index 33c8e2c..a6ecce2 100644
--- a/backend/server/rhnServer/server_class.py
+++ b/backend/server/rhnServer/server_class.py
@@ -667,14 +667,6 @@ class Server(ServerWrapper):
log_debug(3, self.server["id"])
return server_lib.check_entitlement(self.server['id'])
-
-
- # Given a dbiDate object, returns the UNIX representation (seconds since
- # epoch)
- def dbiDate2timestamp(self, dateobj):
- timeString = '%s %s %s %s %s %s' % (dateobj.year, dateobj.month,
- dateobj.day, dateobj.hour, dateobj.minute, dateobj.second)
- return time.mktime(time.strptime(timeString, '%Y %m %d %H %M %S'))
def validateSatCert(self):
# make sure the cert is still valid
diff --git a/backend/server/rhnServer/server_lib.py
b/backend/server/rhnServer/server_lib.py
index e47df37..a0725cf 100644
--- a/backend/server/rhnServer/server_lib.py
+++ b/backend/server/rhnServer/server_lib.py
@@ -272,13 +272,6 @@ def join_rhn(org_id):
""" Stub """
return
-def dbiDate2timestamp(dateobj):
- """ Given a dbiDate object, returns the UNIX representation (seconds
since epoch) """
- timeString = '%s %s %s %s %s %s' % (dateobj.year, dateobj.month,
- dateobj.day, dateobj.hour, dateobj.minute, dateobj.second)
- return time.mktime(time.strptime(timeString, '%Y %m %d %H %M %S'))
-
-
def snapshot_server(server_id, reason):
if CFG.ENABLE_SNAPSHOTS:
return rhnSQL.Procedure("rhn_server.snapshot_server")(server_id,
reason)