Apply Arun Bhanu's patch to add in --quiet and --verbose options instead of

just -q and -v

diff --git a/dumpMetadata.py b/dumpMetadata.py
index e1c5eafa8893344ec7092847a1fe01e4069925b0..8060911105f528ed899652f28362242dfb75c025 100644 (file)
--- a/dumpMetadata.py
+++ b/dumpMetadata.py
@@ -74,7 +74,7 @@ def returnHdr(ts, package):
             fdno = package # let's assume this is an fdno and go with it :)
     except OSError:
         raise MDError, "Error opening file"
-    ts.setVSFlags(~(rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD))
+    ts.setVSFlags((rpm.RPMVSF_NOMD5|rpm.RPMVSF_NEEDPAYLOAD))
     try:
         hdr = ts.hdrFromFdno(fdno)
     except rpm.error:
@@ -102,7 +102,7 @@ def getChecksum(sumtype, file, CHUNK=2**16):
             fo = file # assume it's a file-like-object
         else:
             opened_here = 1
-            fo = open(file, 'r', CHUNK)
+            fo = open(file, 'rb', CHUNK)
             
         if sumtype == 'md5':
             sum = md5.new()
@@ -226,7 +226,7 @@ class RpmMetaData:
         fd = returnFD(filename)
         self.hdr = returnHdr(ts, fd)
         os.lseek(fd, 0, 0)
-        fo = os.fdopen(fd)
+        fo = os.fdopen(fd, 'rb')
         self.pkgid = getChecksum(sumtype, fo)
         fo.seek(0)
         (self.rangestart, self.rangeend) = byteranges(fo)

diff --git a/genpkgmetadata.py b/genpkgmetadata.py
index ecc4f8ba43216e9914f8d4b76ca066f57f982c2e..9c9d37a9beb8df05f5ad68a20adfa8f4f77d2bf1 100755 (executable)
--- a/genpkgmetadata.py
+++ b/genpkgmetadata.py
@@ -170,9 +170,9 @@ def parseArgs(args):
    
     try: 
         for arg,a in gopts:
-            if arg == '-v':
+            if arg in ['-v', '--verbose']:
                 cmds['verbose'] = 1
-            elif arg == "-q":
+            elif arg in ["-q", '--quiet']:
                 cmds['quiet'] = 1
             elif arg in ['-u', '--baseurl']:
                 if cmds['baseurl'] is not None: