From d295367eebfc22942deb8edc8305c0da3540ddb8 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Wed, 7 Nov 2007 22:50:26 +0000 Subject: [PATCH] small workaround for --initialize git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@638 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- libraries/databaseTools.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py index c86d877e0..735312eee 100644 --- a/libraries/databaseTools.py +++ b/libraries/databaseTools.py @@ -74,6 +74,8 @@ def database(options): package = os.path.basename(dbconn.retrieveDownloadURL(idpackage)) branch = dbconn.retrieveBranch(idpackage) revision = dbconn.retrieveRevision(idpackage) + if revision < 0: # just to be sure + revision = 0 revisionsMatch[package] = [branch,revision] except: pass @@ -100,13 +102,8 @@ def database(options): for mybranch in pkgbranches: pkglist = os.listdir(etpConst['packagesbindir']+"/"+mybranch) + pkglist = [x for x in pkglist if x[-5:] == ".tbz2"] - # filter .md5 - _pkglist = [] - for i in pkglist: - if not i.endswith(etpConst['packageshashfileext']): - _pkglist.append(i) - pkglist = _pkglist if (not pkglist): continue @@ -123,9 +120,9 @@ def database(options): etpData = reagentTools.extractPkgData(etpConst['packagesbindir']+"/"+mybranch+"/"+pkg, mybranch) # get previous revision - revisionAvail = revisionsMatch.get(os.path.basename(etpData['download']),None) + revisionAvail = revisionsMatch.get(os.path.basename(etpData['download'])) addRevision = 0 - if (revisionAvail): + if (revisionAvail != None): if mybranch == revisionAvail[0]: addRevision = revisionAvail[1] # fill the db entry