@@ -54,6 +54,7 @@ def __init__(self, treename, root):
self.root = root
self.pkgs = []
self.option = {}
+ self.syncdir = True
if self.treename == "local":
self.dbdir = os.path.join(root, util.PM_DBPATH, treename)
self.dbfile = None
@@ -167,10 +167,11 @@ def generate(self, pacman):
vprint("\t%s" % os.path.join(util.PM_CACHEDIR, pkg.filename()))
if self.cachepkgs:
pkg.makepkg(cachedir)
- else:
+ elif value.syncdir:
pkg.makepkg(os.path.join(syncdir, value.treename))
- pkg.md5sum = util.getmd5sum(pkg.path)
- pkg.csize = os.stat(pkg.path)[stat.ST_SIZE]
+ if pkg.path:
+ pkg.md5sum = util.getmd5sum(pkg.path)
+ pkg.csize = os.stat(pkg.path)[stat.ST_SIZE]
# Creating sync database archives
vprint(" Creating databases")
@@ -122,11 +122,10 @@ def mkcfgfile(filename, root, option, db):
for key in sorted(db.keys()):
if key != "local":
value = db[key]
- data.append("[%s]\n" \
- "SigLevel = %s\n" \
- "Server = file://%s" \
- % (value.treename, value.getverify(), \
- os.path.join(root, SYNCREPO, value.treename)))
+ data.append("[%s]\n" % (value.treename))
+ data.append("SigLevel = %s\n" % (value.getverify()))
+ if value.syncdir:
+ data.append("Server = file://%s" % (os.path.join(root, SYNCREPO, value.treename)))
for optkey, optval in value.option.items():
data.extend(["%s = %s" % (optkey, j) for j in optval])
Populating a file:// Server prevents any manually registered HTTP servers from ever being used. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> --- test/pacman/pmdb.py | 1 + test/pacman/pmtest.py | 7 ++++--- test/pacman/util.py | 9 ++++----- 3 files changed, 9 insertions(+), 8 deletions(-)