backend/common/rhnLib.py | 10 ----------
backend/satellite_tools/satsync.py | 3 ++-
backend/satellite_tools/xmlDiskSource.py | 2 +-
backend/server/configFilesHandler.py | 2 +-
backend/spacewalk/common/checksum.py | 2 +-
spacewalk/certs-tools/sslToolLib.py | 6 ------
6 files changed, 5 insertions(+), 20 deletions(-)
New commits:
commit a6cf06876de4ca5f3dc72aa2b7aabcccc126885f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 10 16:14:59 2009 +0100
removed dead code
diff --git a/backend/common/rhnLib.py b/backend/common/rhnLib.py
index 3df3501..7df7a87 100644
--- a/backend/common/rhnLib.py
+++ b/backend/common/rhnLib.py
@@ -407,12 +407,6 @@ def getFileChecksum(hashtype, filename=None, fd=None, file=None,
buffer_size=Non
return m.hexdigest()
-def getStringChecksum(hashtype, s):
- """ compute checksum of an arbitrary string """
- ctx = hashlib.new(hashtype, s)
- return ctx.hexdigest()
-
-
def rhn_popen(cmd, progressCallback=None, bufferSize=16384, outputLog=None):
""" popen-like function, that accepts execvp-style arguments too (i.e.
an
array of params, thus making shell escaping unnecessary)
commit b1ad19e0018a49908e90934aecb1d7471afd9726
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 10 16:13:51 2009 +0100
removed dead code
diff --git a/backend/common/rhnLib.py b/backend/common/rhnLib.py
index 18a6260..3df3501 100644
--- a/backend/common/rhnLib.py
+++ b/backend/common/rhnLib.py
@@ -407,10 +407,6 @@ def getFileChecksum(hashtype, filename=None, fd=None, file=None,
buffer_size=Non
return m.hexdigest()
-def getStringMD5(s):
- """ compute md5sum of an arbitrary string """
- return getStringChecksum(s)
-
def getStringChecksum(hashtype, s):
""" compute checksum of an arbitrary string """
ctx = hashlib.new(hashtype, s)
diff --git a/spacewalk/certs-tools/sslToolLib.py b/spacewalk/certs-tools/sslToolLib.py
index 7e98e53..1871161 100644
--- a/spacewalk/certs-tools/sslToolLib.py
+++ b/spacewalk/certs-tools/sslToolLib.py
@@ -322,12 +322,6 @@ def getFileMD5(filename=None, fd=None, file=None, buffer_size=None):
return hexify_string(m.digest())
-def getStringMD5(s):
- "compute md5sum of an arbitrary string"
- ctx = md5.new(s)
- return hexify_string(ctx.digest())
-
-
def hexify_string(s):
return ("%02x" * len(s)) % tuple(map(ord, s))
commit 95a398106d4b0c621d7379ba120350475e794d52
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 10 15:59:17 2009 +0100
let's use getStringMD5 from spacewalk.common.checksum
diff --git a/backend/server/configFilesHandler.py b/backend/server/configFilesHandler.py
index 1b5576e..bec6637 100644
--- a/backend/server/configFilesHandler.py
+++ b/backend/server/configFilesHandler.py
@@ -21,7 +21,7 @@ import base64
import os
from common import rhnFault, rhnException, log_debug, CFG, rhnFlags
-from common.rhnLib import getStringMD5
+from spacewalk.common.checksum import getStringMD5
from server import rhnSQL, rhnUser, rhnCapability
from server.rhnHandler import rhnHandler
commit 89234c95243d301ecaf9c5355b996e481d115001
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 10 15:51:13 2009 +0100
getStringChecksum needs 2 params
diff --git a/backend/spacewalk/common/checksum.py b/backend/spacewalk/common/checksum.py
index 261d4ca..3756afb 100644
--- a/backend/spacewalk/common/checksum.py
+++ b/backend/spacewalk/common/checksum.py
@@ -76,7 +76,7 @@ def getFileChecksum(hashtype, filename=None, fd=None, file=None,
buffer_size=Non
def getStringMD5(s):
""" compute md5sum of an arbitrary string """
- return getStringChecksum(s)
+ return getStringChecksum('md5', s)
def getStringChecksum(hashtype, s):
""" compute checksum of an arbitrary string """
commit 832886455858dc73015290a5fc57f8687138f3f6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 10 14:53:16 2009 +0100
fixed import of createPath
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 4e5112a..261afcc 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -48,8 +48,9 @@ from progress_bar import ProgressBar
from xmlSource import FatalParseException, ParseException
from diskImportLib import rpmsPath
+from common.rhnLib import createPath
from syncLib import log, log2, log2disk, log2stderr, log2email, unique
-from syncLib import RhnSyncException, RpmManip, createPath, ReprocessingNeeded
+from syncLib import RhnSyncException, RpmManip, ReprocessingNeeded
from syncLib import initEMAIL_LOG, dumpEMAIL_LOG
from syncLib import FileCreationError, FileManip, intersection
diff --git a/backend/satellite_tools/xmlDiskSource.py
b/backend/satellite_tools/xmlDiskSource.py
index 5d81247..827e29c 100644
--- a/backend/satellite_tools/xmlDiskSource.py
+++ b/backend/satellite_tools/xmlDiskSource.py
@@ -19,7 +19,7 @@
import os
import gzip
import string
-from syncLib import createPath
+from common.rhnLib import createPath
class MissingXmlDiskSourceFileError(Exception):