rpms/createrepo/devel createrepo-relative.patch,1.3,1.4
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Nov 18 16:03:21 UTC 2005
Author: pnasrat
Update of /cvs/dist/rpms/createrepo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19489
Modified Files:
createrepo-relative.patch
Log Message:
fix typo, handle trailing / on dirs
createrepo-relative.patch:
genpkgmetadata.py | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
Index: createrepo-relative.patch
===================================================================
RCS file: /cvs/dist/rpms/createrepo/devel/createrepo-relative.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- createrepo-relative.patch 17 Nov 2005 17:49:55 -0000 1.3
+++ createrepo-relative.patch 18 Nov 2005 16:03:14 -0000 1.4
@@ -2,12 +2,6 @@
===================================================================
--- generate.orig/genpkgmetadata.py
+++ generate/genpkgmetadata.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -t
-+#!/usr/bin/python -t:
- # primary functions and glue for generating the repository metadata
- #
-
@@ -397,11 +397,7 @@ def parseArgs(args):
errorprint(_('Error: Only one groupfile allowed.'))
usage()
@@ -34,11 +28,12 @@
elif arg == '--basedir':
cmds['basedir'] = a
-@@ -431,6 +422,29 @@ def parseArgs(args):
+@@ -431,6 +422,30 @@ def parseArgs(args):
def main(args):
cmds, directories = parseArgs(args)
directory = directories[0]
+# Fix paths
++ directory = os.path.normpath(directory)
+ if os.path.isabs(directory):
+ cmds['basedir'] = directory
+ directory = '.'
More information about the fedora-cvs-commits
mailing list