[Rpm-metadata] 6 commits - createrepo/__init__.py createrepo/readMetadata.py createrepo/utils.py createrepo/yumbased.py genpkgmetadata.py

[Luke Macken]

 createrepo/__init__.py     |   21 +++------------------
 createrepo/readMetadata.py |    1 -
 createrepo/utils.py        |   10 ++++++++--
 createrepo/yumbased.py     |    1 -
 genpkgmetadata.py          |    7 +------
 5 files changed, 12 insertions(+), 28 deletions(-)

New commits:
commit ac18dbc32b8304cdfd3b69843d0cb1c6363f500e
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Feb 12 16:28:45 2008 -0500

    Clean up some more unused modules

diff --git a/genpkgmetadata.py b/genpkgmetadata.py
index 9d60dae..ed369da 100755
--- a/genpkgmetadata.py
+++ b/genpkgmetadata.py
@@ -21,15 +21,10 @@
 import os
 import sys
 from optparse import OptionParser
-import shutil
-
 
 import createrepo
 from createrepo import MDError
-import createrepo.yumbased
-import createrepo.utils
-
-from createrepo.utils import _gzipOpen, errorprint, _, checkAndMakeDir
+from createrepo.utils import errorprint, _
 
 
 def parseArgs(args, conf):
commit bb6479685325d4f365937947a8bad9c2d5374c4b
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Feb 12 16:28:15 2008 -0500

    If we want to use MDError in utils.py, we need to define it outside of __init__ to avoid circular deps

diff --git a/createrepo/__init__.py b/createrepo/__init__.py
index 388e9cc..9ae9272 100644
--- a/createrepo/__init__.py
+++ b/createrepo/__init__.py
@@ -13,7 +13,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 # Copyright 2007  Red Hat, Inc - written by seth vidal skvidal at fedoraproject.org
 
-import exceptions
 import os
 import sys
 import libxml2
@@ -25,7 +24,7 @@ import shutil
 
 from yum import misc, Errors
 import rpmUtils.transaction
-from utils import _, errorprint
+from utils import _, errorprint, MDError
 import readMetadata
 
 try:
@@ -33,22 +32,11 @@ try:
 except ImportError:
     pass
 
-
 from utils import _gzipOpen, bzipFile, checkAndMakeDir, GzipFile, checksum_and_rename
 
-
 __version__ = '0.9.4'
 
 
-
-class MDError(exceptions.Exception):
-    def __init__(self, value=None):
-        exceptions.Exception.__init__(self)
-        self.value = value
-    
-    def __str__(self):
-        return self.value
-
 class MetaDataConfig(object):
     def __init__(self):
         self.quiet = False
diff --git a/createrepo/utils.py b/createrepo/utils.py
index 1b8c147..6ba3855 100644
--- a/createrepo/utils.py
+++ b/createrepo/utils.py
@@ -134,6 +134,12 @@ def checksum_and_rename(fn_path):
     csum_path = os.path.join(fndir, csum_fn)
     os.rename(fn_path, csum_path)
     return (csum, csum_path)
-    
-    
 
+
+class MDError(Exception):
+    def __init__(self, value=None):
+        Exception.__init__(self)
+        self.value = value
+
+    def __str__(self):
+        return self.value
commit a94f1c00406928343197c5ac374abb9bcd351673
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Feb 12 16:27:04 2008 -0500

    Pull in createrepo.utils.errorprint in our __init__ module.

diff --git a/createrepo/__init__.py b/createrepo/__init__.py
index 53f8de7..388e9cc 100644
--- a/createrepo/__init__.py
+++ b/createrepo/__init__.py
@@ -25,7 +25,7 @@ import shutil
 
 from yum import misc, Errors
 import rpmUtils.transaction
-from utils import _
+from utils import _, errorprint
 import readMetadata
 
 try:
commit 200ffe7b630d09b3106d78cb696051906e651639
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Feb 12 16:26:22 2008 -0500

    Import shutil since we use it in createrepo.__init__

diff --git a/createrepo/__init__.py b/createrepo/__init__.py
index f8b7e4d..53f8de7 100644
--- a/createrepo/__init__.py
+++ b/createrepo/__init__.py
@@ -21,7 +21,7 @@ import string
 import fnmatch
 import time
 import yumbased
-
+import shutil
 
 from yum import misc, Errors
 import rpmUtils.transaction
commit 64959ffa2272afcf43784279e3eedc13ae3bbf3e
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Feb 12 16:25:57 2008 -0500

    s/conf.checkts/self.conf.checkts/

diff --git a/createrepo/__init__.py b/createrepo/__init__.py
index 6f17ca5..f8b7e4d 100644
--- a/createrepo/__init__.py
+++ b/createrepo/__init__.py
@@ -186,7 +186,7 @@ class MetaDataGenerator:
                     if not os.access(filepath, os.W_OK):
                         raise MDError, _('error in must be able to write to metadata files:\n  -> %s') % filepath
 
-                    if conf.checkts:
+                    if self.conf.checkts:
                         timestamp = os.path.getctime(filepath)
                         if timestamp > self.conf.mdtimestamp:
                             self.conf.mdtimestamp = timestamp
commit 93e2d626bfc253c462193df458cfdb928b14dec2
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Feb 12 16:25:15 2008 -0500

    Remove a bunch of module imports that we aren't using.
    One of which being 'hashlib', which prevents createrepo from running on anything by Python 2.5.

diff --git a/createrepo/__init__.py b/createrepo/__init__.py
index 2889412..6f17ca5 100644
--- a/createrepo/__init__.py
+++ b/createrepo/__init__.py
@@ -19,11 +19,8 @@ import sys
 import libxml2
 import string
 import fnmatch
-import hashlib
 import time
-import rpm
 import yumbased
-from optparse import OptionContainer
 
 
 from yum import misc, Errors
diff --git a/createrepo/readMetadata.py b/createrepo/readMetadata.py
index faffe69..7ed79e2 100644
--- a/createrepo/readMetadata.py
+++ b/createrepo/readMetadata.py
@@ -16,7 +16,6 @@
 # Copyright 2006 Red Hat
 
 import os
-import sys
 import libxml2
 import stat
 from utils import errorprint, _
diff --git a/createrepo/yumbased.py b/createrepo/yumbased.py
index ac03bdc..1b4d106 100644
--- a/createrepo/yumbased.py
+++ b/createrepo/yumbased.py
@@ -16,7 +16,6 @@
 
 
 import os
-import sys
 import struct
 import rpm
 import types