1. make it actually work :)

2. bump to 0.3.1

diff --git a/Makefile b/Makefile
index d704d077ef7f4c534bf79a61bc1a854d14afc171..b94e4433ed7cd3af4008b0bbad598ad4640b8058 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PACKAGE = createrepo
-VERSION = 0.3
+VERSION = 0.3.1
 SHELL = /bin/sh
 top_srcdir = .
 srcdir = .

diff --git a/createrepo.spec b/createrepo.spec
index 38592b39e5228caca96324998aa354408212dd11..77e04fc33ec8bc016175ad4586b88aae24203170 100644 (file)
--- a/createrepo.spec
+++ b/createrepo.spec
@@ -1,6 +1,6 @@
 Summary: Creates a common metadata repository
 Name: createrepo
-Version: 0.3
+Version: 0.3.1
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -33,6 +33,9 @@ rpm packages
 %{_bindir}/%{name}
 
 %changelog
+* Sun Jan 18 2004 Seth Vidal <skvidal@phy.duke.edu>
+- I'm an idiot
+
 * Sun Jan 18 2004 Seth Vidal <skvidal@phy.duke.edu>
 - 0.3
 

diff --git a/dumpMetadata.py b/dumpMetadata.py
index 11321eb696bf55944626b5632a89a3471ce2044d..d7498691e30300324afc5ff7afcce08f417ee853 100644 (file)
--- a/dumpMetadata.py
+++ b/dumpMetadata.py
@@ -594,14 +594,14 @@ def repoXML(node, cmds):
         workfiles.append((cmds['groupfile'], 'group'))
     
     for (file, ftype) in workfiles:
-        csum = getChecksum(sumtype, file)
-        timestamp = os.stat(file)[8]
+        csum = getChecksum(sumtype, os.path.join(cmds['tempdir'], file))
+        timestamp = os.stat(os.path.join(cmds['tempdir'], file))[8]
         data = node.newChild(None, 'data', None)
         data.newProp('type', ftype)
         location = data.newChild(None, 'location', None)
         if cmds['baseurl'] is not None:
             location.newProp('xml:base', cmds['baseurl'])
-        location.newProp('href', file)
+        location.newProp('href', os.path.join(cmds['finaldir'], file))
         checksum = data.newChild(None, 'checksum', csum)
         checksum.newProp('type', sumtype)
         timestamp = data.newChild(None, 'timestamp', str(timestamp))

diff --git a/genpkgmetadata.py b/genpkgmetadata.py
index dbdfc075f3982156808c94903aaf1cd9b76c317c..76aa93d0ad796892f0544c17fc7d11de0920ce5a 100755 (executable)
--- a/genpkgmetadata.py
+++ b/genpkgmetadata.py
@@ -99,7 +99,9 @@ def trimRpms(rpms, excludeGlobs):
     return rpms
 
 def checkAndMakeDir(dir):
-    """check out the dir and make it, if possible, return 1 if done, else return 0"""
+    """
+     check out the dir and make it, if possible, return 1 if done, else return 0
+    """
     if os.path.exists(dir):
         if not os.path.isdir(dir):
             errorprint(_('%s is not a dir') % dir)