bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pmdb: add option to skip populating file:// server

Browse source 
Populating a file:// Server prevents any manually registered HTTP
servers from ever being used.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2021-01-19 10:30:08 -08:00 • committed by Allan McRae
parent 743e041dbc
commit ad84a572aa
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/pacman/pmdb.py
View file

@ -54,6 +54,7 @@ class pmdb(object):
self.root = root self.root = root
self.pkgs = [] self.pkgs = []
self.option = {} self.option = {}
self.syncdir = True
if self.treename == "local": if self.treename == "local":
self.dbdir = os.path.join(root, util.PM_DBPATH, treename) self.dbdir = os.path.join(root, util.PM_DBPATH, treename)
self.dbfile = None self.dbfile = None

7
test/pacman/pmtest.py
View file

@ -167,10 +167,11 @@ class pmtest(object):
vprint("\t%s" % os.path.join(util.PM_CACHEDIR, pkg.filename())) vprint("\t%s" % os.path.join(util.PM_CACHEDIR, pkg.filename()))
if self.cachepkgs: if self.cachepkgs:
pkg.makepkg(cachedir) pkg.makepkg(cachedir)
else: elif value.syncdir:
pkg.makepkg(os.path.join(syncdir, value.treename)) pkg.makepkg(os.path.join(syncdir, value.treename))
pkg.md5sum = util.getmd5sum(pkg.path) if pkg.path:
pkg.csize = os.stat(pkg.path)[stat.ST_SIZE] pkg.md5sum = util.getmd5sum(pkg.path)
pkg.csize = os.stat(pkg.path)[stat.ST_SIZE]
# Creating sync database archives # Creating sync database archives
vprint(" Creating databases") vprint(" Creating databases")

9
test/pacman/util.py
View file

@ -122,11 +122,10 @@ def mkcfgfile(filename, root, option, db):
for key in sorted(db.keys()): for key in sorted(db.keys()):
if key != "local": if key != "local":
value = db[key] value = db[key]
data.append("[%s]\n" \ data.append("[%s]\n" % (value.treename))
"SigLevel = %s\n" \ data.append("SigLevel = %s\n" % (value.getverify()))
"Server = file://%s" \ if value.syncdir:
% (value.treename, value.getverify(), \ data.append("Server = file://%s" % (os.path.join(root, SYNCREPO, value.treename)))
os.path.join(root, SYNCREPO, value.treename)))
for optkey, optval in value.option.items(): for optkey, optval in value.option.items():
data.extend(["%s = %s" % (optkey, j) for j in optval]) data.extend(["%s = %s" % (optkey, j) for j in optval])