RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: createrepo Date: 07-Aug-2010 01:42:45 Branch: VENDOR Handle: 2010080623424300 Added files: (Branch: VENDOR) createrepo readMetadata.py Modified files: (Branch: VENDOR) createrepo ChangeLog Makefile createrepo.spec dumpMetadata.py genpkgmetadata.py createrepo/docs createrepo.8 Touched files: (Branch: VENDOR) createrepo COPYING README modifyrepo.py createrepo/bin Makefile createrepo modifyrepo createrepo/docs Makefile Log: Import createrepo-0.4.10 [Release Tag: createrepo-0_4_10] Summary: Revision Changes Path 1.1.1.12 +408 -361 createrepo/ChangeLog 1.1.1.21 +2 -1 createrepo/Makefile 1.1.1.21 +7 -1 createrepo/createrepo.spec 1.1.1.6 +0 -0 createrepo/docs/createrepo.8 1.1.1.19 +14 -4 createrepo/dumpMetadata.py 1.1.1.21 +89 -51 createrepo/genpkgmetadata.py 1.1.1.1 +199 -0 createrepo/readMetadata.py ____________________________________________________________________________ patch -p0 <<'@@ .' Index: createrepo/ChangeLog ============================================================================ $ cvs diff -u -r1.1.1.11 -r1.1.1.12 ChangeLog --- createrepo/ChangeLog 6 Aug 2010 23:42:21 -0000 1.1.1.11 +++ createrepo/ChangeLog 6 Aug 2010 23:42:43 -0000 1.1.1.12 @@ -1,643 +1,690 @@ -2007-02-12 23:40 skvidal +2007-06-07 09:17 pnasrat - * Makefile: - add copying and copying.lib to makefile for 'make archive' + * Makefile, genpkgmetadata.py, readMetadata.py, docs/createrepo.8: + This patch adds a --update option to createrepo. + https://lists.dulug.duke.edu/pipermail/rpm-metadata/2007-March/000756.html + Patch from Mike Bonnet <[email protected]> -2007-02-12 23:37 skvidal +2007-05-18 16:01 pnasrat + + * dumpMetadata.py: Fix for older rpm versions Christoph Thiel + <[email protected]> + +2007-05-16 09:05 pnasrat + + * ChangeLog, Makefile, createrepo.spec, genpkgmetadata.py: Update + ChangeLog Bump version to 0.4.9 + +2007-05-16 09:02 pnasrat + + * dumpMetadata.py: Figure out appropriate dbversion Jeremy Katz + <[email protected]> + +2007-05-16 08:59 pnasrat + + * dumpMetadata.py: createrepo-0.4.8-cachefix.patch + * changes the way the hashkey for the cache is generated. (The + original + version just used rpm.RPMTAG_SIGMD5, which was the same for + the same + signed and unsigned package. However, this lead to a wrong + checksum + ending up in the metadata.) + Christoph Thiel <[email protected]> + +2007-05-16 08:58 pnasrat + + * genpkgmetadata.py: createrepo-0.4.8-skip-symlinks.patch + * adds an option to skip symlinks (-S, --skip-symlinks) + Christoph Thiel <[email protected]> + +2007-02-13 04:43 skvidal + + * ChangeLog: + update changelog, again + +2007-02-13 04:40 skvidal + + * Makefile: + add copying and copying.lib to makefile for 'make archive' + +2007-02-13 04:37 skvidal * ChangeLog: check in changelog -2007-02-12 23:37 skvidal +2007-02-13 04:37 skvidal * Makefile: and makefile ver -2007-02-12 23:37 skvidal +2007-02-13 04:37 skvidal * createrepo.spec, genpkgmetadata.py: mark as 0.4.8 -2007-02-08 05:02 pnasrat +2007-02-08 10:02 pnasrat * COPYING.lib, createrepo.spec: Add LGPL file -2007-02-08 05:00 pnasrat +2007-02-08 10:00 pnasrat * COPYING, createrepo.spec: Add COPYING -2007-02-07 15:35 skvidal +2007-02-07 20:35 skvidal * dumpMetadata.py: merge in Christoph Thiel's patch to fix string - conversion for odd EVR's + conversion for odd EVR's -2007-02-07 15:34 skvidal +2007-02-07 20:34 skvidal - * genpkgmetadata.py: - merge Jesse Keatings' patch to find groups file properly + * genpkgmetadata.py: + merge Jesse Keatings' patch to find groups file properly -2007-02-07 01:16 skvidal +2007-02-07 06:16 skvidal * Makefile: ver number in Makefile -2007-02-06 01:12 skvidal +2007-02-06 06:12 skvidal - * createrepo.spec: - yum-metadata-parser dep and new version number + * createrepo.spec: + yum-metadata-parser dep and new version number -2007-02-06 01:12 skvidal +2007-02-06 06:12 skvidal - * docs/createrepo.8: - update docs for -d + * docs/createrepo.8: + update docs for -d -2007-02-06 01:10 skvidal +2007-02-06 06:10 skvidal - * genpkgmetadata.py: - 0.4.7 version number + * genpkgmetadata.py: + 0.4.7 version number -2007-02-04 15:50 skvidal +2007-02-04 20:50 skvidal - * dumpMetadata.py: - make database version listed in repomd + * dumpMetadata.py: + make database version listed in repomd -2007-02-04 13:48 skvidal +2007-02-04 18:48 skvidal - * dumpMetadata.py: - add dbversion to sqlite metadata in repomd. + * dumpMetadata.py: + add dbversion to sqlite metadata in repomd. -2007-02-03 17:07 skvidal +2007-02-03 22:07 skvidal * dumpMetadata.py: default to max compression -2007-02-03 15:40 skvidal +2007-02-03 20:40 skvidal - * dumpMetadata.py: - make the sqlite file names not look stupid + * dumpMetadata.py: + make the sqlite file names not look stupid -2007-02-03 14:06 skvidal +2007-02-03 19:06 skvidal - * dumpMetadata.py, genpkgmetadata.py: - allow optionally creating compressed sqlite databases + * dumpMetadata.py, genpkgmetadata.py: + allow optionally creating compressed sqlite databases -2006-10-21 23:00 lmacken +2006-10-22 04:00 lmacken * ChangeLog, modifyrepo.py: use the mdname for the 'href' element, - so it doesn't explode when dealing with xml.dom.minidom.Document - objects. + so it doesn't explode when dealing with xml.dom.minidom.Document + objects. -2006-10-14 13:26 lmacken +2006-10-14 18:26 lmacken * ChangeLog, Makefile, createrepo.spec, bin/Makefile: 2006-10-14 - 01:30 lmacken - - * Makefile, bin/Makefile, createrepo.spec: Makefile changes - for - modifyrepo, and added it to the spec as well. - -2006-08-23 15:42 lmacken - - * ChangeLog, modifyrepo.py, bin/modifyrepo: 2006-08-23 15:40 - lmacken - - * modifyrepo.py, bin/modifyrepo: Initial import + 01:30 lmacken + + * Makefile, bin/Makefile, createrepo.spec: Makefile + changes for + modifyrepo, and added it to the spec as well. + +2006-08-23 20:42 lmacken -2006-08-11 16:16 pnasrat + * ChangeLog, modifyrepo.py, bin/modifyrepo: 2006-08-23 15:40 + lmacken + + * modifyrepo.py, bin/modifyrepo: Initial import + +2006-08-11 21:16 pnasrat * ChangeLog: Update changelog with cvs2cl -2006-08-11 16:03 pnasrat +2006-08-11 21:03 pnasrat * createrepo.spec: update date -2006-08-11 16:01 pnasrat +2006-08-11 21:01 pnasrat * genpkgmetadata.py, docs/createrepo.8: Patch from Hans-Peter - Jansen <[email protected]> -C, --checkts option added to avoid metadata - generation, if ctime filestamps are up to date. It's currently - mutually exclusive with the --split option. + Jansen <[email protected]> -C, --checkts option added to avoid + metadata generation, if ctime filestamps are up to date. It's + currently mutually exclusive with the --split option. -2006-07-28 15:49 pnasrat +2006-07-28 20:49 pnasrat * genpkgmetadata.py: Fix cache output dir to 0.4.5 behaviour -2006-07-28 15:42 pnasrat +2006-07-28 20:42 pnasrat * genpkgmetadata.py: Fix filtering out path from file list and - passing correct path to writeMetaData + passing correct path to writeMetaData -2006-07-21 13:16 pnasrat +2006-07-21 18:16 pnasrat * Makefile: Bump -2006-07-20 18:27 pnasrat +2006-07-20 23:27 pnasrat * genpkgmetadata.py: Make splitmetadata handler do it' own - getFileList to correctly manipulate paths. + getFileList to correctly manipulate paths. -2006-07-20 13:33 pnasrat +2006-07-20 18:33 pnasrat * genpkgmetadata.py: Set outputdir correctly -2006-07-20 13:20 pnasrat +2006-07-20 18:20 pnasrat * genpkgmetadata.py: Move to split basedir and directory everywhere - to preserve command line paths. Use os.path.walk rather than our - own implementation Improve error messages + to preserve command line paths. Use os.path.walk rather than our + own implementation Improve error messages -2006-07-19 15:43 pnasrat +2006-07-19 20:43 pnasrat * genpkgmetadata.py: Consistent directory handling and errors -2006-07-19 15:43 pnasrat +2006-07-19 20:43 pnasrat * createrepo.spec: genpkgmetadata.py -2006-07-19 15:25 pnasrat +2006-07-19 20:25 pnasrat * dumpMetadata.py: Patch from [email protected] to use a more robust - rpm header signature retrieval method for cache files, as - recommended by Jeff Johnson. + rpm header signature retrieval method for cache files, as + recommended by Jeff Johnson. -2006-07-19 14:26 lmacken +2006-07-19 19:26 lmacken * ChangeLog, createrepo.spec: 2006-07-19 14:23 lmacken - - * createrepo.spec: remove python-urlgrabber dependency -2006-07-19 08:29 pnasrat + * createrepo.spec: remove python-urlgrabber dependency + +2006-07-19 13:29 pnasrat * genpkgmetadata.py: Tolerate unknown files in repodata dirs - - Ville Skyttä + Ville Skyttä -2006-07-19 07:44 pnasrat +2006-07-19 12:44 pnasrat * genpkgmetadata.py: fix up relative paths (#199228) -2006-06-30 08:53 pnasrat +2006-06-30 13:53 pnasrat * dumpMetadata.py: Fix srpm detection for rpm-4.4.6 and later -2006-06-26 11:03 skvidal +2006-06-26 16:03 skvidal - * ChangeLog: - overwrite changelog + * ChangeLog: + overwrite changelog -2006-06-15 11:39 lmacken +2006-06-15 16:39 lmacken * ChangeLog, genpkgmetadata.py, docs/createrepo.8: 2006-06-15 11:40 - lmacken - - * genpkgmetadata.py, docs/createrepo.8: - Revert --update-info-location patch, since yum now supports - arbitrary - metadata via YumRepository::retrieveMD() + lmacken -2006-06-09 09:49 skvidal + * genpkgmetadata.py, docs/createrepo.8: + Revert --update-info-location patch, since yum now supports + arbitrary + metadata via YumRepository::retrieveMD() - * dumpMetadata.py, genpkgmetadata.py: - include Panu's patch to support --noepoch for use with old versions - of rpm +2006-06-09 14:49 skvidal -2006-06-09 09:47 skvidal + * dumpMetadata.py, genpkgmetadata.py: + include Panu's patch to support --noepoch for use with old + versions of rpm - * createrepo.spec: - fix the dep +2006-06-09 14:47 skvidal -2006-06-09 09:46 skvidal + * createrepo.spec: + fix the dep - * createrepo.spec, genpkgmetadata.py: - fix versions and bump by one. - - Thanks to Gareth Armstrong for noticing this. +2006-06-09 14:46 skvidal -2006-03-04 01:30 pnasrat + * createrepo.spec, genpkgmetadata.py: + fix versions and bump by one. + + Thanks to Gareth Armstrong for noticing this. + +2006-03-04 06:30 pnasrat * ChangeLog: add changelog -2006-03-04 01:28 pnasrat +2006-03-04 06:28 pnasrat * createrepo.spec: release -2006-02-21 18:30 pnasrat +2006-02-21 23:30 pnasrat * Makefile, createrepo.spec, genpkgmetadata.py, docs/createrepo.8: - Documentation and version updates + Documentation and version updates -2006-02-21 15:10 pnasrat +2006-02-21 20:10 pnasrat * dumpMetadata.py, genpkgmetadata.py: Enable seperate outputdir - (dgregor) + (dgregor) -2006-02-17 21:22 lmacken +2006-02-18 02:22 lmacken * genpkgmetadata.py, docs/createrepo.8: Add support for -U - (--update-info-location) flag to query a specified server for - package update metadata. The metadata will currently be stored in - 'repodata/update-info' and each package in the primary.xml will - have an <update id="FEDORA-XXXX-XX" - location="update-info/pkg-ver-rel.xml"/> tag which points to it's - corresponding update information. - -2006-01-13 01:24 skvidal - - * dumpMetadata.py, genpkgmetadata.py: - apply two patches from [email protected] - verifies that the - checksum cache file is more recent than the corresponding rpm - - move around cmds dict initialization to make it more consistent. + (--update-info-location) flag to query a specified server for + package update metadata. The metadata will currently be stored + in 'repodata/update-info' and each package in the primary.xml + will have an <update id="FEDORA-XXXX-XX" + location="update-info/pkg-ver-rel.xml"/> tag which points to it's + corresponding update information. + +2006-01-13 06:24 skvidal + + * dumpMetadata.py, genpkgmetadata.py: + apply two patches from [email protected] - verifies that the + checksum cache file is more recent than the corresponding rpm - + move around cmds dict initialization to make it more consistent. -2005-12-08 14:25 pnasrat +2005-12-08 19:25 pnasrat * genpkgmetadata.py: Fix cachedir/groupfile handling with --basedir - and using paths not relative to cwd when run without --basedir. + and using paths not relative to cwd when run without --basedir. -2005-12-08 14:24 pnasrat +2005-12-08 19:24 pnasrat * genpkgmetadata.py: Support --split option to label media with - urls across directories. + urls across directories. -2005-12-08 14:22 pnasrat +2005-12-08 19:22 pnasrat - * genpkgmetadata.py: Split out processing into smaller methods. - Make ts internal. Files and base/file/other data attributes. + * genpkgmetadata.py: Split out processing into smaller methods. + Make ts internal. Files and base/file/other data attributes. -2005-12-08 14:21 pnasrat +2005-12-08 19:21 pnasrat * genpkgmetadata.py: Cleanup of generator class to use cmds - internally as an attribute. + internally as an attribute. -2005-12-08 14:19 pnasrat +2005-12-08 19:19 pnasrat * genpkgmetadata.py: Initial work to form metadata generator class. -2005-11-27 18:01 skvidal +2005-11-27 23:01 skvidal * dumpMetadata.py: speed up by caching file mode lookup by Dennis - Gregorovic + Gregorovic -2005-11-11 16:03 pnasrat +2005-11-11 21:03 pnasrat * dumpMetadata.py, genpkgmetadata.py: Enable basedir to be used - - dgregor + dgregor -2005-11-02 15:23 skvidal +2005-11-02 20:23 skvidal - * dumpMetadata.py, genpkgmetadata.py: - patch from Christoph Thiel to make it work on suse 9.3 and to allow - for non absolute-path cache dirs. + * dumpMetadata.py, genpkgmetadata.py: + patch from Christoph Thiel to make it work on suse 9.3 and to + allow for non absolute-path cache dirs. -2005-08-11 17:09 skvidal +2005-08-11 22:09 skvidal - * dumpMetadata.py: - turn off all signature checking when reading in headers + * dumpMetadata.py: + turn off all signature checking when reading in headers -2005-07-24 19:54 skvidal +2005-07-25 00:54 skvidal - * genpkgmetadata.py: - document that the -g option is for a file relative to the directory - you are creating the repository for. + * genpkgmetadata.py: + document that the -g option is for a file relative to the + directory you are creating the repository for. -2005-07-14 02:34 skvidal +2005-07-14 07:34 skvidal - * docs/createrepo.8: - man page for cachedir + * docs/createrepo.8: + man page for cachedir -2005-07-14 02:31 skvidal +2005-07-14 07:31 skvidal - * Makefile, createrepo.spec, genpkgmetadata.py: - 0.4.3 + * Makefile, createrepo.spec, genpkgmetadata.py: + 0.4.3 -2005-07-11 01:45 skvidal +2005-07-11 06:45 skvidal - * dumpMetadata.py, genpkgmetadata.py: - - disable the checksum flag - default and only use sha1sum's - add - in -c,--cachedir option to setup a cachedir for the cache files of - the checksums of the packages. Uses name-hdrid from the package hdr - as filenames. Contents of the file is a single line of the - package's checksum. This dramatically speeds up rebuilding a - repository's metadata b/c the checksum of the package file was the - item taking the most time. + * dumpMetadata.py, genpkgmetadata.py: + - disable the checksum flag - default and only use sha1sum's - + add in -c,--cachedir option to setup a cachedir for the cache + files of the checksums of the packages. Uses name-hdrid from the + package hdr as filenames. Contents of the file is a single line + of the package's checksum. This dramatically speeds up + rebuilding a repository's metadata b/c the checksum of the + package file was the item taking the most time. -2005-05-28 23:14 skvidal +2005-05-29 04:14 skvidal - * dumpMetadata.py, genpkgmetadata.py: - Apply Arun Bhanu's patch to add in --quiet and --verbose options - instead of just -q and -v + * dumpMetadata.py, genpkgmetadata.py: + Apply Arun Bhanu's patch to add in --quiet and --verbose options + instead of just -q and -v -2005-03-30 00:32 skvidal +2005-03-30 06:32 skvidal - * docs/Makefile: - fix mandir path for docs + * docs/Makefile: + fix mandir path for docs -2005-01-18 02:14 skvidal +2005-01-18 07:14 skvidal - * Makefile, docs/Makefile: - fix the Makefiles, f'real + * Makefile, docs/Makefile: + fix the Makefiles, f'real -2005-01-18 01:59 skvidal +2005-01-18 06:59 skvidal - * docs/: Makefile, createrepo.8: - real commit + * docs/: Makefile, createrepo.8: + real commit -2005-01-18 01:58 skvidal +2005-01-18 06:58 skvidal - * Makefile, createrepo.spec: - adding man page and upating the Makefiles and specfile accordingly. - Thanks Bob Kashani for the man page. + * Makefile, createrepo.spec: + adding man page and upating the Makefiles and specfile + accordingly. Thanks Bob Kashani for the man page. -2005-01-18 01:24 skvidal +2005-01-18 06:24 skvidal - * dumpMetadata.py: - need to seek to the beginning before doing a new read operation. + * dumpMetadata.py: + need to seek to the beginning before doing a new read operation. -2005-01-17 02:52 skvidal +2005-01-17 07:52 skvidal - * Makefile, createrepo.spec: - spec and Makefile to 0.4.2 + * Makefile, createrepo.spec: + spec and Makefile to 0.4.2 -2005-01-17 02:52 skvidal +2005-01-17 07:52 skvidal - * dumpMetadata.py, genpkgmetadata.py: - move around gzipOpen for use in another program relabel 0.4.2 + * dumpMetadata.py, genpkgmetadata.py: + move around gzipOpen for use in another program relabel 0.4.2 -2005-01-07 16:39 skvidal +2005-01-07 21:39 skvidal - * dumpMetadata.py, genpkgmetadata.py: - single open for all file operations. about a 30% time savings. + * dumpMetadata.py, genpkgmetadata.py: + single open for all file operations. about a 30% time savings. -2004-11-02 00:55 skvidal +2004-11-02 05:55 skvidal - * genpkgmetadata.py: - small fix for --exclude to work. -x works, but --exclude didn't, - now it is fixed + * genpkgmetadata.py: + small fix for --exclude to work. -x works, but --exclude didn't, + now it is fixed -2004-10-21 03:42 skvidal +2004-10-21 08:42 skvidal - * Makefile, createrepo.spec, genpkgmetadata.py: - update version numbers + * Makefile, createrepo.spec, genpkgmetadata.py: + update version numbers -2004-10-21 03:40 skvidal +2004-10-21 08:40 skvidal - * dumpMetadata.py: - problem with ghost entries not showing up in primary.xml even if - they matched the regex strings. + * dumpMetadata.py: + problem with ghost entries not showing up in primary.xml even if + they matched the regex strings. -2004-10-18 01:41 skvidal +2004-10-18 06:41 skvidal - * bin/createrepo: - whoops! need to quote that var string + * bin/createrepo: + whoops! need to quote that var string -2004-10-11 07:43 skvidal +2004-10-11 12:43 skvidal - * Makefile, createrepo.spec, genpkgmetadata.py: - correct problem with handling dirs with a space in the filename - update version number + * Makefile, createrepo.spec, genpkgmetadata.py: + correct problem with handling dirs with a space in the filename + update version number -2004-10-03 23:43 skvidal +2004-10-04 04:43 skvidal - * genpkgmetadata.py: - clean up argument parsing to handle --version and --help more - correctly. Not quite the patch Ville Skyttä submitted. + * genpkgmetadata.py: + clean up argument parsing to handle --version and --help more + correctly. Not quite the patch Ville Skyttä submitted. -2004-09-30 01:54 skvidal +2004-09-30 06:54 skvidal - * genpkgmetadata.py: - one more place to tag + * genpkgmetadata.py: + one more place to tag -2004-09-30 01:52 skvidal +2004-09-30 06:52 skvidal - * Makefile, createrepo.spec: - update to 0.3.9 + * Makefile, createrepo.spec: + update to 0.3.9 -2004-09-30 01:49 skvidal +2004-09-30 06:49 skvidal - * dumpMetadata.py: - checksum of group file will be wrong if specified - didn't seek(0) - after copying it. + * dumpMetadata.py: + checksum of group file will be wrong if specified - didn't + seek(0) after copying it. -2004-09-20 01:13 skvidal +2004-09-20 06:13 skvidal - * genpkgmetadata.py: - made 'cannot remove old metadata dir' a non-fatal error. It just - warns. + * genpkgmetadata.py: + made 'cannot remove old metadata dir' a non-fatal error. It just + warns. -2004-09-20 01:06 skvidal +2004-09-20 06:06 skvidal - * genpkgmetadata.py: - updated to default to sha-1 checksums + * genpkgmetadata.py: + updated to default to sha-1 checksums -2004-09-11 16:19 skvidal +2004-09-11 21:19 skvidal - * createrepo.spec, genpkgmetadata.py: - update spec file as 0.3.8 fix for bug in command handling of groups - location + * createrepo.spec, genpkgmetadata.py: + update spec file as 0.3.8 fix for bug in command handling of + groups location -2004-09-11 16:07 skvidal +2004-09-11 21:07 skvidal - * Makefile: - fix for group file path being wrong - Bill Nottingham mark as 0.3.8 + * Makefile: + fix for group file path being wrong - Bill Nottingham mark as + 0.3.8 -2004-09-11 16:07 skvidal +2004-09-11 21:07 skvidal - * dumpMetadata.py, genpkgmetadata.py: - fix for error when string is None for utf8 conversion + * dumpMetadata.py, genpkgmetadata.py: + fix for error when string is None for utf8 conversion -2004-09-03 02:29 skvidal +2004-09-03 07:29 skvidal - * Makefile: - Makefile update to fix a bug reported by Anvil + * Makefile: + Makefile update to fix a bug reported by Anvil -2004-09-01 02:56 skvidal +2004-09-01 07:56 skvidal - * Makefile, createrepo.spec, genpkgmetadata.py: - 0.3.7 + * Makefile, createrepo.spec, genpkgmetadata.py: + 0.3.7 -2004-08-27 03:03 skvidal +2004-08-27 08:03 skvidal - * dumpMetadata.py, genpkgmetadata.py: - patch from Ville Skytta (this a will be wrong, sorry) to correct - decoding/encoding problems. + * dumpMetadata.py, genpkgmetadata.py: + patch from Ville Skytta (this a will be wrong, sorry) to correct + decoding/encoding problems. -2004-07-23 16:22 skvidal +2004-07-23 21:22 skvidal - * README: - updated readme with anoncvs location + * README: + updated readme with anoncvs location -2004-07-23 15:41 skvidal +2004-07-23 20:41 skvidal - * Makefile, createrepo.spec, genpkgmetadata.py: - ver to 0.3.6 + * Makefile, createrepo.spec, genpkgmetadata.py: + ver to 0.3.6 -2004-07-23 14:45 skvidal +2004-07-23 19:45 skvidal - * dumpMetadata.py: - fix filelists to be complete + * dumpMetadata.py: + fix filelists to be complete -2004-07-23 11:56 skvidal +2004-07-23 16:56 skvidal - * dumpMetadata.py: - remove a debug print call + * dumpMetadata.py: + remove a debug print call -2004-07-23 11:51 skvidal +2004-07-23 16:51 skvidal * Makefile, createrepo.spec: mark as 0.3.5 -2004-07-23 11:50 skvidal +2004-07-23 16:50 skvidal - * dumpMetadata.py: - fix up for broken filelists in packages + * dumpMetadata.py: + fix up for broken filelists in packages -2004-07-23 01:23 skvidal +2004-07-23 06:23 skvidal - * genpkgmetadata.py: - silly string fix + * genpkgmetadata.py: + silly string fix -2004-07-19 21:24 skvidal +2004-07-20 02:24 skvidal - * Makefile, createrepo.spec, genpkgmetadata.py: - bump number to 0.3.4 + * Makefile, createrepo.spec, genpkgmetadata.py: + bump number to 0.3.4 -2004-07-19 21:23 skvidal +2004-07-20 02:23 skvidal - * dumpMetadata.py, genpkgmetadata.py: - re-enabled group files documented it + * dumpMetadata.py, genpkgmetadata.py: + re-enabled group files documented it -2004-06-30 04:23 skvidal +2004-06-30 09:23 skvidal - * dumpMetadata.py: - add pre=1 to requires entries for prereq marking + * dumpMetadata.py: + add pre=1 to requires entries for prereq marking -2004-06-30 03:08 skvidal +2004-06-30 08:08 skvidal - * dumpMetadata.py, genpkgmetadata.py: - - include xmlns:rpm in main metadata tag rather than per-format - node - fix output for sorta-list, sorta-string rpm header tags + * dumpMetadata.py, genpkgmetadata.py: + - include xmlns:rpm in main metadata tag rather than per-format + node - fix output for sorta-list, sorta-string rpm header tags -2004-06-28 11:24 skvidal +2004-06-28 16:24 skvidal - * dumpMetadata.py: - fix for namespace for license, vendor, group, buildhost and - sourcerpm was None, should have been formatns (rpm namespace) + * dumpMetadata.py: + fix for namespace for license, vendor, group, buildhost and + sourcerpm was None, should have been formatns (rpm namespace) -2004-06-08 23:09 skvidal +2004-06-09 04:09 skvidal - * Makefile, createrepo.spec, genpkgmetadata.py: - mark as 0.3.3 + * Makefile, createrepo.spec, genpkgmetadata.py: + mark as 0.3.3 -2004-06-06 18:38 skvidal +2004-06-06 23:38 skvidal - * genpkgmetadata.py: - included a not-that-terribly accurate package count + * genpkgmetadata.py: + included a not-that-terribly accurate package count -2004-06-05 14:38 skvidal +2004-06-05 19:38 skvidal - * dumpMetadata.py, genpkgmetadata.py: - generate uncompressed checksums a much easier way. + * dumpMetadata.py, genpkgmetadata.py: + generate uncompressed checksums a much easier way. -2004-06-05 14:31 skvidal +2004-06-05 19:31 skvidal - * dumpMetadata.py, genpkgmetadata.py: - revert some changes + * dumpMetadata.py, genpkgmetadata.py: + revert some changes -2004-06-03 02:14 skvidal +2004-06-03 07:14 skvidal - * genpkgmetadata.py: - fix stupid version thing + * genpkgmetadata.py: + fix stupid version thing -2004-06-03 02:14 skvidal +2004-06-03 07:14 skvidal - * dumpMetadata.py, genpkgmetadata.py: - keep checksum of uncompressed metadata files in repomd.xml + * dumpMetadata.py, genpkgmetadata.py: + keep checksum of uncompressed metadata files in repomd.xml -2004-06-03 01:26 skvidal +2004-06-03 06:26 skvidal - * dumpMetadata.py, genpkgmetadata.py: - move versioned prco from separate string to properties of the entry + * dumpMetadata.py, genpkgmetadata.py: + move versioned prco from separate string to properties of the + entry -2004-04-16 01:15 skvidal +2004-04-16 06:15 skvidal - * Makefile: - fix makefile + * Makefile: + fix makefile -2004-04-16 01:10 skvidal +2004-04-16 06:10 skvidal - * Makefile, createrepo.spec, genpkgmetadata.py: - update to 0.3.2 added -p or --pretty flag to make it pretty-print - the xml output not pretty printing the output makes the import a - lot faster and the data smaller + * Makefile, createrepo.spec, genpkgmetadata.py: + update to 0.3.2 added -p or --pretty flag to make it pretty-print + the xml output not pretty printing the output makes the import a + lot faster and the data smaller -2004-01-18 16:43 skvidal +2004-01-18 21:43 skvidal - * Makefile, createrepo.spec, dumpMetadata.py, genpkgmetadata.py: - 1. make it actually work :) 2. bump to 0.3.1 + * Makefile, createrepo.spec, dumpMetadata.py, genpkgmetadata.py: + 1. make it actually work :) 2. bump to 0.3.1 -2004-01-18 12:57 skvidal +2004-01-18 17:57 skvidal - * Makefile, createrepo.spec: - add README for real *boggle* + * Makefile, createrepo.spec: + add README for real *boggle* -2004-01-18 12:56 skvidal +2004-01-18 17:56 skvidal - * Makefile, README, createrepo.spec: - tagged Makefile and createrepo as 0.3 Add README to both of the - above + * Makefile, README, createrepo.spec: + tagged Makefile and createrepo as 0.3 Add README to both of the + above -2004-01-18 11:45 skvidal +2004-01-18 16:45 skvidal - * genpkgmetadata.py: - make metadata files be written to repodata/ + * genpkgmetadata.py: + make metadata files be written to repodata/ -2004-01-17 01:04 skvidal +2004-01-17 06:04 skvidal - * dumpMetadata.py, genpkgmetadata.py: - fix bug where not all files were getting included make the - directory detection more reliable + * dumpMetadata.py, genpkgmetadata.py: + fix bug where not all files were getting included make the + directory detection more reliable -2004-01-13 22:56 skvidal +2004-01-14 03:56 skvidal * Makefile, createrepo.spec, dumpMetadata.py, genpkgmetadata.py, - bin/Makefile: - fixed memory use problem updated spec for 0.2 fixed makefile - dumbness fixed problems with broken symlinks + bin/Makefile: + fixed memory use problem updated spec for 0.2 fixed makefile + dumbness fixed problems with broken symlinks -2004-01-13 16:16 skvidal +2004-01-13 21:16 skvidal - * dumpMetadata.py: - catch some errors on broken symlinks + * dumpMetadata.py: + catch some errors on broken symlinks -2004-01-11 17:07 skvidal +2004-01-11 22:07 skvidal * Makefile, createrepo.spec, dumpMetadata.py, genpkgmetadata.py, - bin/Makefile, bin/createrepo: - - translation stubs - makefiles - spec file - bin wrapper + bin/Makefile, bin/createrepo: + - translation stubs - makefiles - spec file - bin wrapper -2004-01-10 03:39 skvidal +2004-01-10 08:39 skvidal - * dumpMetadata.py, genpkgmetadata.py: - silly updates in comments + * dumpMetadata.py, genpkgmetadata.py: + silly updates in comments -2004-01-10 03:34 skvidal +2004-01-10 08:34 skvidal - * dumpMetadata.py, genpkgmetadata.py: - CVS Id Tags + * dumpMetadata.py, genpkgmetadata.py: + CVS Id Tags -2004-01-10 03:34 skvidal +2004-01-10 08:34 skvidal * dumpMetadata.py: [no log message] -2004-01-10 03:33 skvidal +2004-01-10 08:33 skvidal - * genpkgmetadata.py: - added --version and __version__ string + * genpkgmetadata.py: + added --version and __version__ string -2004-01-10 03:04 skvidal +2004-01-10 08:04 skvidal - * dumpMetadata.py, genpkgmetadata.py: - move two functions around to more logically arrange the repomd.xml - generating function + * dumpMetadata.py, genpkgmetadata.py: + move two functions around to more logically arrange the + repomd.xml generating function -2004-01-09 02:48 skvidal +2004-01-09 07:48 skvidal - * dumpMetadata.py, genpkgmetadata.py: metadata generate first - import + * dumpMetadata.py, genpkgmetadata.py: Initial revision -2004-01-09 02:48 skvidal +2004-01-09 07:48 skvidal - * dumpMetadata.py, genpkgmetadata.py: Initial revision + * dumpMetadata.py, genpkgmetadata.py: metadata generate first + import @@ . patch -p0 <<'@@ .' Index: createrepo/Makefile ============================================================================ $ cvs diff -u -r1.1.1.20 -r1.1.1.21 Makefile --- createrepo/Makefile 6 Aug 2010 23:42:21 -0000 1.1.1.20 +++ createrepo/Makefile 6 Aug 2010 23:42:43 -0000 1.1.1.21 @@ -1,5 +1,5 @@ PACKAGE = createrepo -VERSION = 0.4.8 +VERSION = 0.4.10 SHELL = /bin/sh top_srcdir = . srcdir = . @@ -41,6 +41,7 @@ MODULES = $(srcdir)/genpkgmetadata.py \ $(srcdir)/dumpMetadata.py \ + $(srcdir)/readMetadata.py \ $(srcdir)/modifyrepo.py .SUFFIXES: .py .pyc @@ . patch -p0 <<'@@ .' Index: createrepo/createrepo.spec ============================================================================ $ cvs diff -u -r1.1.1.20 -r1.1.1.21 createrepo.spec --- createrepo/createrepo.spec 6 Aug 2010 23:42:21 -0000 1.1.1.20 +++ createrepo/createrepo.spec 6 Aug 2010 23:42:43 -0000 1.1.1.21 @@ -1,6 +1,6 @@ Summary: Creates a common metadata repository Name: createrepo -Version: 0.4.8 +Version: 0.4.10 Release: 1 License: GPL Group: System Environment/Base @@ -36,6 +36,12 @@ %{_mandir}/man8/createrepo.8* %changelog +* Thu Jun 07 2007 Paul Nasrat <pnasrat at redhat.com> +- 0.4.10 + +* Wed May 16 2007 Paul Nasrat <pnasrat at redhat.com> +- 0.4.9 + * Mon Feb 12 2007 Seth Vidal <skvidal at linux.duke.edu> - 0.4.8 @@ . patch -p0 <<'@@ .' Index: createrepo/docs/createrepo.8 ============================================================================ $ cvs diff -u -r1.1.1.5 -r1.1.1.6 docs/createrepo.8 @@ . patch -p0 <<'@@ .' Index: createrepo/dumpMetadata.py ============================================================================ $ cvs diff -u -r1.1.1.18 -r1.1.1.19 dumpMetadata.py --- createrepo/dumpMetadata.py 6 Aug 2010 23:42:21 -0000 1.1.1.18 +++ createrepo/dumpMetadata.py 6 Aug 2010 23:42:43 -0000 1.1.1.19 @@ -16,7 +16,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Copyright 2004 Duke University -# $Id: dumpMetadata.py,v 1.1.1.18 2010/08/06 23:42:21 jbj Exp $ +# $Id: dumpMetadata.py,v 1.1.1.19 2010/08/06 23:42:43 jbj Exp $ import os import rpm @@ -586,9 +586,16 @@ if not self.options['cache']: return getChecksum(self.options['sumtype'], fo) - key = "".join([hex(ord(x))[2:].zfill(2) - for x in tuple(self.hdr[rpm.RPMTAG_SIGMD5])]) + t = [] + if type(self.hdr[rpm.RPMTAG_SIGGPG]) is not types.NoneType: + t.append("".join(self.hdr[rpm.RPMTAG_SIGGPG])) + if type(self.hdr[rpm.RPMTAG_SIGPGP]) is not types.NoneType: + t.append("".join(self.hdr[rpm.RPMTAG_SIGPGP])) + if type(self.hdr[rpm.RPMTAG_HDRID]) is not types.NoneType: + t.append("".join(self.hdr[rpm.RPMTAG_HDRID])) + key = md5.new("".join(t)).hexdigest() + csumtag = '%s-%s' % (self.hdr['name'] , key) csumfile = '%s/%s' % (self.options['cachedir'], csumtag) if os.path.exists(csumfile) and self.mtime <= os.stat(csumfile)[8]: @@ -769,7 +776,10 @@ repopath = os.path.join(cmds['outputdir'], cmds['tempdir']) if cmds['database']: - dbversion = '9' + try: + dbversion = str(sqlitecachec.DBVERSION) + except AttributeError: + dbversion = '9' rp = sqlitecachec.RepodataParserSqlite(repopath, repoid, None) for (file, ftype) in workfiles: @@ . patch -p0 <<'@@ .' Index: createrepo/genpkgmetadata.py ============================================================================ $ cvs diff -u -r1.1.1.20 -r1.1.1.21 genpkgmetadata.py --- createrepo/genpkgmetadata.py 6 Aug 2010 23:42:21 -0000 1.1.1.20 +++ createrepo/genpkgmetadata.py 6 Aug 2010 23:42:43 -0000 1.1.1.21 @@ -17,7 +17,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Copyright 2004 Duke University -# $Id: genpkgmetadata.py,v 1.1.1.20 2010/08/06 23:42:21 jbj Exp $ +# $Id: genpkgmetadata.py,v 1.1.1.21 2010/08/06 23:42:43 jbj Exp $ import os @@ -30,8 +30,9 @@ import shutil import dumpMetadata +import readMetadata from dumpMetadata import _gzipOpen -__version__ = '0.4.8' +__version__ = '0.4.9' def errorprint(stuff): print >> sys.stderr, stuff @@ -61,6 +62,7 @@ -h, --help = show this help -V, --version = output version -p, --pretty = output xml files in pretty format. + --update = update existing metadata (if present) -d, --database = generate the sqlite databases. """) @@ -83,6 +85,8 @@ for fn in names: if os.path.isdir(fn): continue + if self.cmds['skip-symlinks'] and os.path.islink(fn): + continue elif fn[-extlen:].lower() == '%s' % (ext): relativepath = dirname.replace(startdir, "", 1) relativepath = relativepath.lstrip("/") @@ -122,6 +126,18 @@ """all the heavy lifting for the package metadata""" # rpms we're going to be dealing with + if self.cmds['update']: + #build the paths + basefile = os.path.join(self.cmds['outputdir'], self.cmds['finaldir'], self.cmds['primaryfile']) + flfile = os.path.join(self.cmds['outputdir'], self.cmds['finaldir'], self.cmds['filelistsfile']) + otherfile = os.path.join(self.cmds['outputdir'], self.cmds['finaldir'], self.cmds['otherfile']) + opts = { + 'verbose' : self.cmds['verbose'], + 'pkgdir' : os.path.normpath(os.path.join(self.cmds['basedir'], directory)) + } + #and scan the old repo + self.oldData = readMetadata.MetadataIndex(self.cmds['outputdir'], + basefile, flfile, otherfile, opts) files = self.getFileList(self.cmds['basedir'], directory, '.rpm') files = self.trimRpms(files) self.pkgcount = len(files) @@ -172,61 +188,76 @@ self.otherfile.write('<otherdata xmlns="http://linux.duke.edu/metadata/other" packages="%s">\n' % self.pkgcount) + def _getNodes(self, file, directory, current): + basenode = None + filesnode = None + othernode = None + try: + rpmdir= os.path.join(self.cmds['basedir'], directory) + mdobj = dumpMetadata.RpmMetaData(self.ts, rpmdir, file, self.cmds) + except dumpMetadata.MDError, e: + errorprint('\n%s - %s' % (e, file)) + return None + try: + basenode = dumpMetadata.generateXML(self.basedoc, self.baseroot, self.formatns, mdobj, self.cmds['sumtype']) + except dumpMetadata.MDError, e: + errorprint(_('\nAn error occurred creating primary metadata: %s') % e) + return None + try: + filesnode = dumpMetadata.fileListXML(self.filesdoc, self.filesroot, mdobj) + except dumpMetadata.MDError, e: + errorprint(_('\nAn error occurred creating filelists: %s') % e) + return None + try: + othernode = dumpMetadata.otherXML(self.otherdoc, self.otherroot, mdobj) + except dumpMetadata.MDError, e: + errorprint(_('\nAn error occurred: %s') % e) + return None + return basenode,filesnode,othernode + def writeMetadataDocs(self, files, directory, current=0): for file in files: current+=1 - try: - rpmdir= os.path.join(self.cmds['basedir'], directory) - mdobj = dumpMetadata.RpmMetaData(self.ts, rpmdir, file, self.cmds) - if not self.cmds['quiet']: - if self.cmds['verbose']: - print '%d/%d - %s' % (current, len(files), file) - else: - sys.stdout.write('\r' + ' ' * 80) - sys.stdout.write("\r%d/%d - %s" % (current, self.pkgcount, file)) - sys.stdout.flush() - except dumpMetadata.MDError, e: - errorprint('\n%s - %s' % (e, file)) - continue - else: - try: - node = dumpMetadata.generateXML(self.basedoc, self.baseroot, self.formatns, mdobj, self.cmds['sumtype']) - except dumpMetadata.MDError, e: - errorprint(_('\nAn error occurred creating primary metadata: %s') % e) - continue + recycled = False + sep = '-' + if self.cmds['update']: + #see if we can pull the nodes from the old repo + nodes = self.oldData.getNodes(file) + if nodes is not None: + recycled = True + sep = '*' + if not recycled: + #scan rpm files + nodes = self._getNodes(file, directory, current) + if nodes is None: + return + basenode, filenode, othernode = nodes + del nodes + if not self.cmds['quiet']: + if self.cmds['verbose']: + print '%d/%d %s %s' % (current, self.pkgcount, sep, file) else: - output = node.serialize('UTF-8', self.cmds['pretty']) - self.basefile.write(output) - self.basefile.write('\n') - node.unlinkNode() - node.freeNode() - del node + sys.stdout.write('\r' + ' ' * 80) + sys.stdout.write("\r%d/%d %s %s" % (current, self.pkgcount, sep, file)) + sys.stdout.flush() + if basenode is None: + continue - try: - node = dumpMetadata.fileListXML(self.filesdoc, self.filesroot, mdobj) - except dumpMetadata.MDError, e: - errorprint(_('\nAn error occurred creating filelists: %s') % e) - continue - else: - output = node.serialize('UTF-8', self.cmds['pretty']) - self.flfile.write(output) - self.flfile.write('\n') + for node, outfile in ((basenode,self.basefile), + (filenode,self.flfile), + (othernode,self.otherfile)): + if node is None: + break + output = node.serialize('UTF-8', self.cmds['pretty']) + outfile.write(output) + outfile.write('\n') + if not recycled: + #recycled nodes can be multiply referenced node.unlinkNode() node.freeNode() - del node + if recycled: + self.oldData.freeNodes(file) - try: - node = dumpMetadata.otherXML(self.otherdoc, self.otherroot, mdobj) - except dumpMetadata.MDError, e: - errorprint(_('\nAn error occurred: %s') % e) - continue - else: - output = node.serialize('UTF-8', self.cmds['pretty']) - self.otherfile.write(output) - self.otherfile.write('\n') - node.unlinkNode() - node.freeNode() - del node return current @@ -377,17 +408,20 @@ cmds['checkts'] = False cmds['mdtimestamp'] = 0 cmds['split'] = False + cmds['update'] = False cmds['outputdir'] = "" cmds['database'] = False cmds['file-pattern-match'] = ['.*bin\/.*', '^\/etc\/.*', '^\/usr\/lib\/sendmail$'] cmds['dir-pattern-match'] = ['.*bin\/.*', '^\/etc\/.*'] + cmds['skip-symlinks'] = False try: - gopts, argsleft = getopt.getopt(args, 'phqVvndg:s:x:u:c:o:C', ['help', 'exclude=', + gopts, argsleft = getopt.getopt(args, 'phqVvndg:s:x:u:c:o:CS', ['help', 'exclude=', 'quiet', 'verbose', 'cachedir=', 'basedir=', 'baseurl=', 'groupfile=', 'checksum=', 'version', 'pretty', 'split', 'outputdir=', - 'noepoch', 'checkts', 'database']) + 'noepoch', 'checkts', 'database', 'update', + 'skip-symlinks']) except getopt.error, e: errorprint(_('Options Error: %s.') % e) usage() @@ -445,6 +479,8 @@ elif arg in ['-c', '--cachedir']: cmds['cache'] = True cmds['cachedir'] = a + elif arg == '--update': + cmds['update'] = True elif arg in ['-C', '--checkts']: cmds['checkts'] = True elif arg == '--basedir': @@ -455,6 +491,8 @@ cmds['noepoch'] = True elif arg in ['-d', '--database']: cmds['database'] = True + elif arg in ['-S', '--skip-symlinks']: + cmds['skip-symlinks'] = True except ValueError, e: errorprint(_('Options Error: %s') % e) @@ . patch -p0 <<'@@ .' Index: createrepo/readMetadata.py ============================================================================ $ cvs diff -u -r0 -r1.1.1.1 readMetadata.py --- /dev/null 2010-08-07 01:38:43.000000000 +0200 +++ readMetadata.py 2010-08-07 01:42:44.757244715 +0200 @@ -0,0 +1,199 @@ +#!/usr/bin/python -t + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Copyright 2006 Red Hat + +import os +import sys +import libxml2 +import pprint +import stat + +def errorprint(stuff): + print >> sys.stderr, stuff + +def _(args): + """Stub function for translation""" + return args + +class MetadataIndex(object): + + def __init__(self, outputdir, basefile, filelistfile, otherfile, opts=None): + if opts is None: + opts = {} + self.opts = opts + self.outputdir = outputdir + self.files = {'base' : basefile, + 'filelist' : filelistfile, + 'other' : otherfile} + self.scan() + + def scan(self): + """Read in and index old repo data""" + self.basenodes = {} + self.filesnodes = {} + self.othernodes = {} + self.pkg_ids = {} + if self.opts.get('verbose'): + print _("Scanning old repo data") + for file in self.files.values(): + if not os.path.exists(file): + #cannot scan + errorprint(_("Previous repo file missing: %s") % file) + return + root = libxml2.parseFile(self.files['base']).getRootElement() + self._scanPackageNodes(root, self._handleBase) + if self.opts.get('verbose'): + print _("Indexed %i base nodes" % len(self.basenodes)) + root = libxml2.parseFile(self.files['filelist']).getRootElement() + self._scanPackageNodes(root, self._handleFiles) + if self.opts.get('verbose'): + print _("Indexed %i filelist nodes" % len(self.filesnodes)) + root = libxml2.parseFile(self.files['other']).getRootElement() + self._scanPackageNodes(root, self._handleOther) + if self.opts.get('verbose'): + print _("Indexed %i other nodes" % len(self.othernodes)) + #reverse index pkg ids to track references + self.pkgrefs = {} + for relpath, pkgid in self.pkg_ids.iteritems(): + self.pkgrefs.setdefault(pkgid,[]).append(relpath) + + def _scanPackageNodes(self, root, handler): + node = root.children + while node is not None: + if node.type != "element": + node = node.next + continue + if node.name == "package": + handler(node) + node = node.next + + def _handleBase(self, node): + top = node + node = node.children + pkgid = None + mtime = None + size = None + relpath = None + while node is not None: + if node.type != "element": + node = node.next + continue + if node.name == "checksum": + pkgid = node.content + elif node.name == "time": + mtime = int(node.prop('file')) + elif node.name == "size": + size = int(node.prop('package')) + elif node.name == "location": + relpath = node.prop('href') + node = node.next + if relpath is None: + print _("Incomplete data for node") + return + if pkgid is None: + print _("pkgid missing for %s") % relpath + return + if mtime is None: + print _("mtime missing for %s") % relpath + return + if size is None: + print _("size missing for %s") % relpath + return + filepath = os.path.join(self.opts['pkgdir'], relpath) + try: + st = os.stat(filepath) + except OSError: + #file missing -- ignore + return + if not stat.S_ISREG(st.st_mode): + #ignore non files + return + #check size and mtime + if st.st_size != size: + if self.opts.get('verbose'): + print _("Size (%i -> %i) changed for file %s") % (size,st.st_size,filepath) + return + if st.st_mtime != mtime: + if self.opts.get('verbose'): + print _("Modification time changed for %s") % filepath + return + #otherwise we index + self.basenodes[relpath] = top + self.pkg_ids[relpath] = pkgid + + def _handleFiles(self, node): + pkgid = node.prop('pkgid') + if pkgid: + self.filesnodes[pkgid] = node + + def _handleOther(self, node): + pkgid = node.prop('pkgid') + if pkgid: + self.othernodes[pkgid] = node + + def getNodes(self, relpath): + """Return base, filelist, and other nodes for file, if they exist + + Returns a tuple of nodes, or None if not found + """ + bnode = self.basenodes.get(relpath,None) + if bnode is None: + return None + pkgid = self.pkg_ids.get(relpath,None) + if pkgid is None: + print _("No pkgid found for: %s") % relpath + return None + fnode = self.filesnodes.get(pkgid,None) + if fnode is None: + return None + onode = self.othernodes.get(pkgid,None) + if onode is None: + return None + return bnode, fnode, onode + + def freeNodes(self,relpath): + #causing problems + """Free up nodes corresponding to file, if possible""" + bnode = self.basenodes.get(relpath,None) + if bnode is None: + print "Missing node for %s" % relpath + return + bnode.unlinkNode() + bnode.freeNode() + del self.basenodes[relpath] + pkgid = self.pkg_ids.get(relpath,None) + if pkgid is None: + print _("No pkgid found for: %s") % relpath + return None + del self.pkg_ids[relpath] + dups = self.pkgrefs.get(pkgid) + dups.remove(relpath) + if len(dups): + #still referenced + return + del self.pkgrefs[pkgid] + for nodes in self.filesnodes, self.othernodes: + node = nodes.get(pkgid) + if node is not None: + node.unlinkNode() + node.freeNode() + del nodes[pkgid] + + +if __name__ == "__main__": + #test code - attempts to read a repo in working directory + idx = MetadataIndex(".", "repodata/primary.xml.gz", "repodata/filelists.xml.gz", + "repodata/other.xml.gz", {'verbose':1}) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
