backend/satellite_tools/syncLib.py | 4 --
backend/server/importlib/test/test_blob_update.py | 31 ----------------------
backend/server/rhnPackageUpload.py | 8 -----
backend/server/rhnServer/server_token.py | 6 ----
backend/server/rhnVirtualization.py | 9 ------
backend/server/test/misc_functions.py | 8 -----
backend/spacewalk/common/rhn_rpm.py | 12 --------
7 files changed, 78 deletions(-)
New commits:
commit e43dcf1bc30c0c9c3cfb0e91702308ef33a0feb1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 17:04:39 2010 +0200
Removal of spacewalk-backend-upload-server makes source_match not called anywhere,
removing.
diff --git a/backend/server/rhnPackageUpload.py b/backend/server/rhnPackageUpload.py
index ff0dc66..c294d38 100644
--- a/backend/server/rhnPackageUpload.py
+++ b/backend/server/rhnPackageUpload.py
@@ -30,14 +30,6 @@ from spacewalk.server.rhnLib import get_package_path, \
from spacewalk.server.rhnServer import server_packages
from spacewalk.server.rhnSQL.const import ORACLE, POSTGRESQL
-def source_match(v1, v2):
- """ returns true if both parameters are true, false otherwise
"""
- if v1 and v2:
- return 1
- if not v1 and not v2:
- return 1
- return 0
-
def write_temp_file(req, buffer_size, packaging=None):
""" Write request to temporary file (write max. buffer_size at once).
commit ffd24f7634c511cfc8ecf74dd6f466fabfe2f577
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 17:02:25 2010 +0200
The _timeString0 function looks unused, we shall consider it a dead code.
diff --git a/backend/satellite_tools/syncLib.py b/backend/satellite_tools/syncLib.py
index 51210a4..679479b 100644
--- a/backend/satellite_tools/syncLib.py
+++ b/backend/satellite_tools/syncLib.py
@@ -59,10 +59,6 @@ class ReprocessingNeeded(Exception):
## 3 - a bit much
## 4+ - excessive
-def _timeString0():
- """time string as: "Mon Nov 18 12:56:34 2002"
"""
- return time.ctime(time.time())
-
def _timeString1():
"""time string as: "2002/11/18 12:56:34" """
return log_time()
commit a184fa55ed4c9cdf0b00ad2d989321fe56ef6b0d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 17:00:32 2010 +0200
The sql_exception_text utility function never called, seems like a dead code.
diff --git a/backend/server/rhnServer/server_token.py
b/backend/server/rhnServer/server_token.py
index 014cb22..799ae0e 100644
--- a/backend/server/rhnServer/server_token.py
+++ b/backend/server/rhnServer/server_token.py
@@ -29,12 +29,6 @@ from server_lib import join_server_group
VIRT_ENT_LABEL = 'virtualization_host'
VIRT_PLATFORM_ENT_LABEL = 'virtualization_host_platform'
-# Convert a SQLError exception into the appropriate text
-def sql_exception_text(e):
- if isinstance(e, rhnSQL.SQLSchemaError):
- return e.errmsg
- return str(e)
-
# Handle channel subscriptions for the registration token
def token_channels(server, server_arch, tokens_obj):
assert(isinstance(tokens_obj, ActivationTokens))
commit 12a76e4b209da8deca8444d59571c316e832fdd2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:59:10 2010 +0200
The sortHeaders is not called in our code base, removing.
diff --git a/backend/spacewalk/common/rhn_rpm.py b/backend/spacewalk/common/rhn_rpm.py
index 9552151..8302bc4 100644
--- a/backend/spacewalk/common/rhn_rpm.py
+++ b/backend/spacewalk/common/rhn_rpm.py
@@ -355,18 +355,6 @@ def rpmLabelCompare(rpmFilename1, rpmFilename2):
get_package_header(rpmFilename2))
-def sortHeaders(hdrs):
- """ Sorts a list of RPM headers (or RPMs).
- Assertion: they *must* exist.
- """
-
- assert isinstance(hdrs, type([]))
-
- sorted = hdrs[:]
- sorted.sort(hdrLabelCompare)
- return sorted
-
-
def sortRPMs(rpms):
""" Sorts a list of RPM files. They *must* exist. """
commit 2ea8c3b3b95408a41a8edae584fe5a2d1635ee16
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:57:42 2010 +0200
That setup_old function in test does not seem to be called, we better remove it.
diff --git a/backend/server/importlib/test/test_blob_update.py
b/backend/server/importlib/test/test_blob_update.py
index a9d9744..9900ded 100644
--- a/backend/server/importlib/test/test_blob_update.py
+++ b/backend/server/importlib/test/test_blob_update.py
@@ -127,37 +127,6 @@ def setup(table, blob_values, fields):
t.query(hash_values)
rhnSQL.commit()
-def setup_old(blob_values):
- h = rhnSQL.prepare("delete from test_blob_update")
- h.execute()
-
- h = rhnSQL.prepare("""
- insert into test_blob_update (id1, id2, val1, val2)
- values (:id1, :id2, empty_blob(), empty_blob())
- """)
- for v in blob_values:
- h.execute(id1=v[0], id2=v[1])
-
- q = "select val1, val2 from test_blob_update where id1 = :id1 and %s for
update"
- for v in blob_values:
- i1 = v[0]
- i2 = v[1]
- hval = {'id1' : i1}
- if i2 is None:
- s = "id2 is null"
- else:
- s = "id2 = :id2"
- hval['id2'] = i2
- h = rhnSQL.prepare(q % s)
- apply(h.execute, (), hval)
- row = h.fetchone_dict()
- val1 = row['val1']
- val2 = row['val2']
- val1.write(v[2])
- val2.write(v[3])
-
- rhnSQL.commit()
-
def verify(blob_values):
q = """
select val1, val2 from test_blob_update where id1 = :id1 and %s
commit 4c99940be5f3b2b3fb74d5a9762cf1e5f1e2a1fe
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:55:46 2010 +0200
If remove_listener not in our code, remove(remove_listener).
diff --git a/backend/server/rhnVirtualization.py b/backend/server/rhnVirtualization.py
index c01ef9e..f6db269 100644
--- a/backend/server/rhnVirtualization.py
+++ b/backend/server/rhnVirtualization.py
@@ -128,15 +128,6 @@ def add_listener(listener):
if not listener in Listeners.listeners:
Listeners.listeners.append(listener)
-def remove_listener(listener):
- """
- Removes a virt event listener.
- """
- log_debug(3, "Virt listener removed: %s" % str(listener))
-
- if listener in Listeners.listeners:
- Listeners.listeners.remove(listener)
-
###############################################################################
# VirtualizationEventHandler Class
commit 33002e96318df785e5611d30b60ecd9d33b91614
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 26 16:44:59 2010 +0200
Function register_system not called, removing.
diff --git a/backend/server/test/misc_functions.py
b/backend/server/test/misc_functions.py
index 1da2651..0f589e1 100644
--- a/backend/server/test/misc_functions.py
+++ b/backend/server/test/misc_functions.py
@@ -326,14 +326,6 @@ def build_sys_params_with_username(**kwargs):
del params['token']
return params
-def register_system( params ):
- data = registration.Registration().new_system(params)
- sysfile = open("/tmp/systemid", "w+")
- sysfile.write(data)
- sysfile.close()
-
- return data
-
def create_activation_key(org_id=None, user_id=None, groups=None,