From 501cd013258d062d8150cac93e1148c7292117e7 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Sun, 18 Jan 2004 21:43:05 +0000 Subject: [PATCH] 1. make it actually work :) 2. bump to 0.3.1 --- Makefile | 2 +- createrepo.spec | 5 ++++- dumpMetadata.py | 6 +++--- genpkgmetadata.py | 4 +++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d704d07..b94e443 100644 --- 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 38592b3..77e04fc 100644 --- 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 +- I'm an idiot + * Sun Jan 18 2004 Seth Vidal - 0.3 diff --git a/dumpMetadata.py b/dumpMetadata.py index 11321eb..d749869 100644 --- 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 dbdfc07..76aa93d 100755 --- 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) -- 2.34.1