- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] TESTS: add missing tests
by Andrew Gregory 03 Oct '13

03 Oct '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- If anybody's interested, I have a script that can be used in a post-{commit,merge,applypatch} hook to check for unlisted tests here: https://github.com/andrewgregory/bin/blob/master/checktestlist test/pacman/tests/TESTS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 2b47244..6652041 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -48,6 +48,8 @@ test/pacman/tests/fileconflict023.py \ test/pacman/tests/fileconflict024.py \ test/pacman/tests/fileconflict025.py \ test/pacman/tests/fileconflict030.py \ +test/pacman/tests/fileconflict031.py \ +test/pacman/tests/fileconflict032.py \ test/pacman/tests/ignore001.py \ test/pacman/tests/ignore002.py \ test/pacman/tests/ignore003.py \ @@ -158,6 +160,8 @@ test/pacman/tests/sync043.py \ test/pacman/tests/sync044.py \ test/pacman/tests/sync045.py \ test/pacman/tests/sync050.py \ +test/pacman/tests/sync051.py \ +test/pacman/tests/sync052.py \ test/pacman/tests/sync100.py \ test/pacman/tests/sync1000.py \ test/pacman/tests/sync1003.py \ -- 1.8.4

2 3

[pacman-dev] config question: Signed-off-by
by Jeremy Heiner 02 Oct '13

02 Oct '13

Is there a way to have "commit -s" obfuscate the Signed-off-by? Or is that just something I have to remember to do every time?

1 0

[pacman-dev] Fwd: [PATCH] RFC: support incremental build with VCS sources.
by Lukas Jirkovsky 01 Oct '13

01 Oct '13

Accidentally sent this to a wrong address... I hope forwarding this won't break the patch. --- Hi, This patch adds incremental build support for the packages with VCS sources. It is not complete work (only GIT is supported), but a mere request for comments. If there is a chance that something like this will be accepted, I will extend the support to other VCS, too. Rationale: When someone uses a VCS package, there is a high chance that such user wants to follow the development more closely. This means that the user will be rebuilding the package often. However, rebuilding the whole package takes a lot of time. This can be somewhat mitigated by using ccache. However, the greatest speedup can be achieved by incremental build. The problem is that current VCS support makes this pretty much imposible by removing the cloned sources before building. This patch adds a new option --incremental. Using this option forces makepkg to only update the cloned source directory instead of removing it and cloning anew. This allows make to use the incremental build feature. See also FS#35050 I've been using this patch for a few days with kdevplatform-git and kdevelop-git (not the ones from AUR) at it works great. It already saved me a lot of time, while using nice and clean PKGBUILD (so far I have been using the old-style VCS packages that clone sources in their build() function to achive similar functionality). Any comments are welcome. Lukas scripts/makepkg.sh.in | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 67ec240..2ac813a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -66,6 +66,7 @@ FORCE=0 INFAKEROOT=0 GENINTEG=0 HOLDVER=0 +VCSINCREMENTAL=0 SKIPCHECKSUMS=0 SKIPPGPCHECK=0 INSTALL=0 @@ -580,12 +581,20 @@ extract_git() { msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "git" pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - if ! git clone "$dir"; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 + if [[ VCSINCREMENTAL -ne 0 && -d "${dir##*/}" ]]; then + pushd `pwd` &>/dev/null + cd_safe "${dir##*/}" + git pull + popd &>/dev/null + else + rm -rf "${dir##*/}" + + if ! git clone "$dir"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" + plain "$(gettext "Aborting...")" + exit 1 + fi fi cd_safe "${dir##*/}" @@ -607,7 +616,7 @@ extract_git() { fi if [[ -n $ref ]]; then - if ! git checkout -b makepkg $ref; then + if ! git checkout -B makepkg $ref; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -2510,6 +2519,7 @@ usage() { printf -- "$(gettext " --check Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" printf -- "$(gettext " --holdver Do not update VCS sources")\n" + printf -- "$(gettext " --incremental Incremental build with VCS sources (only updates build dir)")\n" printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg" printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" @@ -2554,7 +2564,7 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' - 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' + 'help' 'holdver' 'incremental' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') @@ -2589,6 +2599,7 @@ while true; do -F) INFAKEROOT=1 ;; -g|--geninteg) GENINTEG=1 ;; --holdver) HOLDVER=1 ;; + --incremental) VCSINCREMENTAL=1 ;; -i|--install) INSTALL=1 ;; --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; -- 1.8.4

3 6

[pacman-dev] [PATCH 1] Simplify pmtest.generate and .run API (removed pacman parameter).
by Jeremy Heiner 01 Oct '13

01 Oct '13

Previously pmtest.__init__ received and cached the pmenv.root, and generate and run received the pmenv.pacman. Now __init__ receives and caches the pmenv, allowing any method to fetch root, pacman, or other pmenv goodies directly instead of needing the extra parameter. Moved the "which fakeroot" and "which fakechroot" logic from pmtest up into pmenv. Repeating the probes and warnings for each test was a bit redundant. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail> --- test/pacman/pmenv.py | 28 +++++++++++++++-- test/pacman/pmrule.py | 10 +++--- test/pacman/pmtest.py | 87 +++++++++++++++++++++++---------------------------- 3 files changed, 70 insertions(+), 55 deletions(-) diff --git a/test/pacman/pmenv.py b/test/pacman/pmenv.py index f358285..3cfcfa5 100644 --- a/test/pacman/pmenv.py +++ b/test/pacman/pmenv.py @@ -21,6 +21,7 @@ import pmtest import tap +import util class pmenv(object): @@ -43,6 +44,27 @@ def __init__(self, root = "root"): "nolog": 0 } + if os.geteuid() != 0: + self.fakeroot = util.which("fakeroot") + if not self.fakeroot: + tap.diag("WARNING: fakeroot not found!") + else: + self.fakeroot = "fakeroot" + + self.fakechroot = util.which("fakechroot") + if not self.fakechroot: + tap.diag("WARNING: fakechroot not found!") + else: + self.fakechroot = "fakechroot" + + def cmdroot(self): + cmd = [] + if self.fakeroot: + cmd.append(self.fakeroot) + if self.fakechroot: + cmd.append(self.fakechroot) + return cmd + def __str__(self): return "root = %s\n" \ "pacman = %s" \ @@ -53,7 +75,7 @@ def addtest(self, testcase): """ if not os.path.isfile(testcase): raise IOError("test file %s not found" % testcase) - test = pmtest.pmtest(testcase, self.root) + test = pmtest.pmtest(testcase, self) self.testcases.append(test) def run(self): @@ -64,8 +86,8 @@ def run(self): tap.diag("Running '%s'" % t.testname) t.load() - t.generate(self.pacman) - t.run(self.pacman) + t.generate() + t.run() tap.diag("==> Checking rules") tap.todo = t.expectfailure diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index c97a158..718c87c 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -56,7 +56,7 @@ def check(self, test): if test.retcode != int(key): success = 0 elif case == "OUTPUT": - logfile = os.path.join(test.root, util.LOGFILE) + logfile = os.path.join(test.env.root, util.LOGFILE) if not os.access(logfile, os.F_OK): tap.diag("LOGFILE not found, cannot validate 'OUTPUT' rule") success = 0 @@ -112,7 +112,7 @@ def check(self, test): tap.diag("PKG rule '%s' not found" % case) success = -1 elif kind == "FILE": - filename = os.path.join(test.root, key) + filename = os.path.join(test.env.root, key) if case == "EXIST": if not os.path.isfile(filename): success = 0 @@ -152,7 +152,7 @@ def check(self, test): tap.diag("FILE rule '%s' not found" % case) success = -1 elif kind == "DIR": - filename = os.path.join(test.root, key) + filename = os.path.join(test.env.root, key) if case == "EXIST": if not os.path.isdir(filename): success = 0 @@ -160,7 +160,7 @@ def check(self, test): tap.diag("DIR rule '%s' not found" % case) success = -1 elif kind == "LINK": - filename = os.path.join(test.root, key) + filename = os.path.join(test.env.root, key) if case == "EXIST": if not os.path.islink(filename): success = 0 @@ -168,7 +168,7 @@ def check(self, test): tap.diag("LINK rule '%s' not found" % case) success = -1 elif kind == "CACHE": - cachedir = os.path.join(test.root, util.PM_CACHEDIR) + cachedir = os.path.join(test.env.root, util.PM_CACHEDIR) if case == "EXISTS": pkg = test.findpkg(key, value, allow_local=True) if not pkg or not os.path.isfile( diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index b343d55..63d25e8 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -35,20 +35,20 @@ class pmtest(object): """Test object """ - def __init__(self, name, root): + def __init__(self, name, env): self.name = name self.testname = os.path.basename(name).replace('.py', '') - self.root = root + self.env = env self.cachepkgs = True def __str__(self): return "name = %s\n" \ "testname = %s\n" \ - "root = %s" % (self.name, self.testname, self.root) + "root = %s" % (self.name, self.testname, self.env.root) def addpkg2db(self, treename, pkg): if not treename in self.db: - self.db[treename] = pmdb.pmdb(treename, self.root) + self.db[treename] = pmdb.pmdb(treename, self.env.root) self.db[treename].pkgs.append(pkg) def addpkg(self, pkg): @@ -83,7 +83,7 @@ def load(self): self.args = "" self.retcode = 0 self.db = { - "local": pmdb.pmdb("local", self.root) + "local": pmdb.pmdb("local", self.env.root) } self.localpkgs = [] self.createlocalpkgs = False @@ -104,37 +104,40 @@ def load(self): else: raise IOError("file %s does not exist!" % self.name) - def generate(self, pacman): + def generate(self): tap.diag("==> Generating test environment") + root = self.env.root + pacman = self.env.pacman + # Cleanup leftover files from a previous test session - if os.path.isdir(self.root): - shutil.rmtree(self.root) - vprint("\t%s" % self.root) + if os.path.isdir(root): + shutil.rmtree(root) + vprint("\t%s" % root) # Create directory structure vprint(" Creating directory structure:") - dbdir = os.path.join(self.root, util.PM_SYNCDBPATH) - cachedir = os.path.join(self.root, util.PM_CACHEDIR) - syncdir = os.path.join(self.root, util.SYNCREPO) - tmpdir = os.path.join(self.root, util.TMPDIR) - logdir = os.path.join(self.root, os.path.dirname(util.LOGFILE)) - etcdir = os.path.join(self.root, os.path.dirname(util.PACCONF)) - bindir = os.path.join(self.root, "bin") + dbdir = os.path.join(root, util.PM_SYNCDBPATH) + cachedir = os.path.join(root, util.PM_CACHEDIR) + syncdir = os.path.join(root, util.SYNCREPO) + tmpdir = os.path.join(root, util.TMPDIR) + logdir = os.path.join(root, os.path.dirname(util.LOGFILE)) + etcdir = os.path.join(root, os.path.dirname(util.PACCONF)) + bindir = os.path.join(root, "bin") ldconfig = os.path.basename(pacman["ldconfig"]) - ldconfigdir = os.path.join(self.root, os.path.dirname(pacman["ldconfig"][1:])) + ldconfigdir = os.path.join(root, os.path.dirname(pacman["ldconfig"][1:])) shell = pacman["scriptlet-shell"][1:] - shelldir = os.path.join(self.root, os.path.dirname(shell)) + shelldir = os.path.join(root, os.path.dirname(shell)) sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir, ldconfigdir, shelldir] for sys_dir in sys_dirs: if not os.path.isdir(sys_dir): - vprint("\t%s" % sys_dir[len(self.root)+1:]) + vprint("\t%s" % sys_dir[len(root)+1:]) os.makedirs(sys_dir, 0755) # Only the dynamically linked binary is needed for fakechroot shutil.copy("/bin/sh", bindir) if shell != "bin/sh": - shutil.copy("/bin/sh", os.path.join(self.root, shell)) + shutil.copy("/bin/sh", os.path.join(root, shell)) shutil.copy(os.path.join(util.SELFPATH, "ldconfig.stub"), os.path.join(ldconfigdir, ldconfig)) ld_so_conf = open(os.path.join(etcdir, "ld.so.conf"), "w") @@ -142,7 +145,7 @@ def generate(self, pacman): # Configuration file vprint(" Creating configuration file") - util.mkcfgfile(util.PACCONF, self.root, self.option, self.db) + util.mkcfgfile(util.PACCONF, root, self.option, self.db) # Creating packages vprint(" Creating package archives") @@ -174,24 +177,24 @@ def generate(self, pacman): vprint(" Populating file system") for f in self.filesystem: vprint("\t%s" % f) - util.mkfile(self.root, f, f) - path = os.path.join(self.root, f) + util.mkfile(root, f, f) + path = os.path.join(root, f) if os.path.isfile(path): os.utime(path, (355, 355)) for pkg in self.db["local"].pkgs: vprint("\tinstalling %s" % pkg.fullname()) - pkg.install_package(self.root) + pkg.install_package(root) # Done. vprint(" Taking a snapshot of the file system") - for roots, dirs, files in os.walk(self.root): + for roots, dirs, files in os.walk(root): for i in files: filename = os.path.join(roots, i) - f = pmfile.PacmanFile(self.root, filename.replace(self.root + "/", "")) + f = pmfile.PacmanFile(root, filename.replace(root + "/", "")) self.files.append(f) vprint("\t%s" % f.name) - def run(self, pacman): + def run(self): if os.path.isfile(util.PM_LOCK): tap.bail("\tERROR: another pacman session is on-going -- skipping") return @@ -199,19 +202,9 @@ def run(self, pacman): tap.diag("==> Running test") vprint("\tpacman %s" % self.args) - cmd = [] - if os.geteuid() != 0: - fakeroot = util.which("fakeroot") - if not fakeroot: - tap.diag("WARNING: fakeroot not found!") - else: - cmd.append("fakeroot") - - fakechroot = util.which("fakechroot") - if not fakechroot: - tap.diag("WARNING: fakechroot not found!") - else: - cmd.append("fakechroot") + root = self.env.root + pacman = self.env.pacman + cmd = self.env.cmdroot() if pacman["gdb"]: cmd.extend(["libtool", "execute", "gdb", "--args"]) @@ -223,17 +216,17 @@ def run(self, pacman): "--show-reachable=yes", "--suppressions=%s" % suppfile]) cmd.extend([pacman["bin"], - "--config", os.path.join(self.root, util.PACCONF), - "--root", self.root, - "--dbpath", os.path.join(self.root, util.PM_DBPATH), - "--cachedir", os.path.join(self.root, util.PM_CACHEDIR)]) + "--config", os.path.join(root, util.PACCONF), + "--root", root, + "--dbpath", os.path.join(root, util.PM_DBPATH), + "--cachedir", os.path.join(root, util.PM_CACHEDIR)]) if not pacman["manual-confirm"]: cmd.append("--noconfirm") if pacman["debug"]: cmd.append("--debug=%s" % pacman["debug"]) cmd.extend(shlex.split(self.args)) if not (pacman["gdb"] or pacman["valgrind"] or pacman["nolog"]): - output = open(os.path.join(self.root, util.LOGFILE), 'w') + output = open(os.path.join(root, util.LOGFILE), 'w') else: output = None vprint("\trunning: %s" % " ".join(cmd)) @@ -242,7 +235,7 @@ def run(self, pacman): # archives are made available more easily. time_start = time.time() self.retcode = subprocess.call(cmd, stdout=output, stderr=output, - cwd=os.path.join(self.root, util.TMPDIR), env={'LC_ALL': 'C'}) + cwd=os.path.join(root, util.TMPDIR), env={'LC_ALL': 'C'}) time_end = time.time() vprint("\ttime elapsed: %.2fs" % (time_end - time_start)) @@ -256,7 +249,7 @@ def run(self, pacman): tap.diag("\tERROR: %s not removed" % util.PM_LOCK) os.unlink(util.PM_LOCK) # Look for a core file - if os.path.isfile(os.path.join(self.root, util.TMPDIR, "core")): + if os.path.isfile(os.path.join(root, util.TMPDIR, "core")): tap.diag("\tERROR: pacman dumped a core file") def check(self): -- 1.8.4

2 2

[pacman-dev] [PATCH 2] Added tests for -Q --check (but not yet for mtree checks).
by Jeremy Heiner 30 Sep '13

30 Sep '13

Two new "hooks" were made available in pmtest: genhook is called after everything is generated just before the snapshot is taken, and snaphook is called just after. A hook is a list of strings. Calling a hook is "exec"ing each string in the list. Several helper functions were added to pmtest: pacmanrun, unlink, rmtree and warnmissing. These can be used in a hook to install a package and then intentionally mess it up, which then allows the pmtest to verify the results of "-Qk". An mtree attribute was added to pmtest, and a parameter added to pmpkg.makepkg, in anticipation of testing "-Qkk". TODO: figure out how to create an mtree in makepkg. Signed-off-by: Jeremy Heiner <ScalaProtractor at gmail> --- test/pacman/pmpkg.py | 2 +- test/pacman/pmtest.py | 75 ++++++++++++++++++++++++++++---------- test/pacman/tests/querycheck001.py | 18 +++++++++ test/pacman/tests/querycheck002.py | 24 ++++++++++++ test/pacman/tests/querycheck003.py | 24 ++++++++++++ test/pacman/tests/querycheck004.py | 25 +++++++++++++ test/pacman/tests/querycheck005.py | 31 ++++++++++++++++ test/pacman/tests/querycheck006.py | 19 ++++++++++ test/pacman/util.py | 1 + 9 files changed, 199 insertions(+), 20 deletions(-) create mode 100644 test/pacman/tests/querycheck001.py create mode 100644 test/pacman/tests/querycheck002.py create mode 100644 test/pacman/tests/querycheck003.py create mode 100644 test/pacman/tests/querycheck004.py create mode 100644 test/pacman/tests/querycheck005.py create mode 100644 test/pacman/tests/querycheck006.py diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index 9b3147a..1397229 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -104,7 +104,7 @@ def parse_filename(name): filename, extra = filename.split("|") return filename - def makepkg(self, path): + def makepkg(self, mtree, path): """Creates an Arch Linux package archive. A package archive is generated in the location 'path', based on the data diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 63d25e8..739c445 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -18,6 +18,7 @@ import os +import re import shlex import shutil import stat @@ -92,6 +93,10 @@ def load(self): self.description = "" self.option = {} + self.mtree = False + self.genhook = [] + self.snaphook = [] + # Test rules self.rules = [] self.files = [] @@ -152,7 +157,7 @@ def generate(self): for pkg in self.localpkgs: vprint("\t%s" % os.path.join(util.TMPDIR, pkg.filename())) pkg.finalize() - pkg.makepkg(tmpdir) + pkg.makepkg(self.mtree, tmpdir) for key, value in self.db.iteritems(): for pkg in value.pkgs: pkg.finalize() @@ -161,9 +166,9 @@ def generate(self): for pkg in value.pkgs: vprint("\t%s" % os.path.join(util.PM_CACHEDIR, pkg.filename())) if self.cachepkgs: - pkg.makepkg(cachedir) + pkg.makepkg(self.mtree, cachedir) else: - pkg.makepkg(os.path.join(syncdir, value.treename)) + pkg.makepkg(self.mtree, os.path.join(syncdir, value.treename)) pkg.md5sum = util.getmd5sum(pkg.path) pkg.csize = os.stat(pkg.path)[stat.ST_SIZE] @@ -187,12 +192,58 @@ def generate(self): # Done. vprint(" Taking a snapshot of the file system") + for cmd in self.genhook: + exec cmd for roots, dirs, files in os.walk(root): for i in files: filename = os.path.join(roots, i) f = pmfile.PacmanFile(root, filename.replace(root + "/", "")) self.files.append(f) vprint("\t%s" % f.name) + for cmd in self.snaphook: + exec cmd + + def pacmanbin(self): + root = self.env.root + return([self.env.pacman["bin"], + "--config", os.path.join(root, util.PACCONF), + "--root", root, + "--dbpath", os.path.join(root, util.PM_DBPATH), + "--cachedir", os.path.join(root, util.PM_CACHEDIR)]) + + def pacmansub(self, cmd, output): + vprint("\trunning: %s" % " ".join(cmd)) + # Change to the tmp dir before running pacman, so that local package + # archives are made available more easily. + time_start = time.time() + retcode = subprocess.call(cmd, stdout=output, stderr=output, + cwd=os.path.join(self.env.root, util.TMPDIR), + env={'LC_ALL': 'C'}) + time_end = time.time() + vprint("\ttime elapsed: %.2fs" % (time_end - time_start)) + vprint("\tretcode = %s" % retcode) + return retcode + + def pacmanrun(self, args): + cmd = self.env.cmdroot() + cmd.extend(self.pacmanbin()) + cmd.append("--noconfirm") + cmd.extend(shlex.split(args)) + output = open(os.path.join(self.env.root, util.GENFILE), 'a') + self.pacmansub(cmd, output) + output.close() + + def unlink(self, path): + path = os.path.join(self.env.root, path) + os.unlink(path) + def rmtree(self, path): + path = os.path.join(self.env.root, path) + shutil.rmtree(path) + def warnmissing(self, pkg, path): + return "PACMAN_OUTPUT=^" + re.escape( + "warning: %s: %s (No such file or directory)" + % (pkg.name, os.path.join(self.env.root, path)) + ) + "$" def run(self): if os.path.isfile(util.PM_LOCK): @@ -215,11 +266,7 @@ def run(self): "--tool=memcheck", "--leak-check=full", "--show-reachable=yes", "--suppressions=%s" % suppfile]) - cmd.extend([pacman["bin"], - "--config", os.path.join(root, util.PACCONF), - "--root", root, - "--dbpath", os.path.join(root, util.PM_DBPATH), - "--cachedir", os.path.join(root, util.PM_CACHEDIR)]) + cmd.extend(self.pacmanbin()) if not pacman["manual-confirm"]: cmd.append("--noconfirm") if pacman["debug"]: @@ -229,21 +276,11 @@ def run(self): output = open(os.path.join(root, util.LOGFILE), 'w') else: output = None - vprint("\trunning: %s" % " ".join(cmd)) - - # Change to the tmp dir before running pacman, so that local package - # archives are made available more easily. - time_start = time.time() - self.retcode = subprocess.call(cmd, stdout=output, stderr=output, - cwd=os.path.join(root, util.TMPDIR), env={'LC_ALL': 'C'}) - time_end = time.time() - vprint("\ttime elapsed: %.2fs" % (time_end - time_start)) + self.retcode = self.pacmansub(cmd, output) if output: output.close() - vprint("\tretcode = %s" % self.retcode) - # Check if the lock is still there if os.path.isfile(util.PM_LOCK): tap.diag("\tERROR: %s not removed" % util.PM_LOCK) diff --git a/test/pacman/tests/querycheck001.py b/test/pacman/tests/querycheck001.py new file mode 100644 index 0000000..8587b50 --- /dev/null +++ b/test/pacman/tests/querycheck001.py @@ -0,0 +1,18 @@ +self.description = "Query--check files, all there" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename()]) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=0") diff --git a/test/pacman/tests/querycheck002.py b/test/pacman/tests/querycheck002.py new file mode 100644 index 0000000..0bc3ff4 --- /dev/null +++ b/test/pacman/tests/querycheck002.py @@ -0,0 +1,24 @@ +self.description = "Query--check files, missing a file" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) + +zap = pkg.files[1] + +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename(), + "self.unlink('%s')" % zap]) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule(self.warnmissing(pkg, zap)) +self.addrule("PACMAN_OUTPUT= 1 missing file$") diff --git a/test/pacman/tests/querycheck003.py b/test/pacman/tests/querycheck003.py new file mode 100644 index 0000000..bda095d --- /dev/null +++ b/test/pacman/tests/querycheck003.py @@ -0,0 +1,24 @@ +self.description = "Query--check files, missing a link" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) + +zap = pkg.files[2].split(' -> ')[0] + +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename(), + "self.unlink('%s')" % zap]) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule(self.warnmissing(pkg, zap)) +self.addrule("PACMAN_OUTPUT= 1 missing file$") diff --git a/test/pacman/tests/querycheck004.py b/test/pacman/tests/querycheck004.py new file mode 100644 index 0000000..be9c381 --- /dev/null +++ b/test/pacman/tests/querycheck004.py @@ -0,0 +1,25 @@ +self.description = "Query--check files, missing a dir" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) + +zap = pkg.files[3] + +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename(), + "self.rmtree('%s')" % zap]) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule(self.warnmissing(pkg, zap)) +self.addrule(self.warnmissing(pkg, pkg.files[4])) +self.addrule("PACMAN_OUTPUT= 2 missing files$") diff --git a/test/pacman/tests/querycheck005.py b/test/pacman/tests/querycheck005.py new file mode 100644 index 0000000..416e17f --- /dev/null +++ b/test/pacman/tests/querycheck005.py @@ -0,0 +1,31 @@ +self.description = "Query--check files, missing several" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) + +zap1 = pkg.files[1] +zap2 = pkg.files[2].split(' -> ')[0] +zap3 = pkg.files[3] + +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename(), + "self.unlink('%s')" % zap1, + "self.unlink('%s')" % zap2, + "self.rmtree('%s')" % zap3]) + +self.args = "-Qk" + +self.addrule("PACMAN_RETCODE=1") +self.addrule(self.warnmissing(pkg, zap1)) +self.addrule(self.warnmissing(pkg, zap2)) +self.addrule(self.warnmissing(pkg, zap3)) +self.addrule(self.warnmissing(pkg, pkg.files[4])) +self.addrule("PACMAN_OUTPUT= 4 missing files$") diff --git a/test/pacman/tests/querycheck006.py b/test/pacman/tests/querycheck006.py new file mode 100644 index 0000000..d710a5b --- /dev/null +++ b/test/pacman/tests/querycheck006.py @@ -0,0 +1,19 @@ +self.description = "Query--check mtree, no mtree" + +pkg = pmpkg("dummy") +pkg.files = [ + "etc/dummy.conf", + "lib/libdummy.so.0", + "lib/libdummy.so -> ./libdummy.so.0", + "lib/dummy/", + "lib/dummy/stuff", + "bin/dummy"] + +self.addpkg(pkg) +self.genhook.extend([ + "self.pacmanrun('-U %s')" % pkg.filename()]) + +self.args = "-Qkk" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=dummy: no mtree file") diff --git a/test/pacman/util.py b/test/pacman/util.py index 14035d7..db8fef3 100644 --- a/test/pacman/util.py +++ b/test/pacman/util.py @@ -40,6 +40,7 @@ TMPDIR = "tmp" SYNCREPO = "var/pub" LOGFILE = "var/log/pactest.log" +GENFILE = "var/log/pacgen.log" verbose = 0 -- 1.8.4

1 0

[pacman-dev] [PATCH] Display old and new version in pacman -Qu output
by Florian Pritz 26 Sep '13

26 Sep '13

This changes the output from "foo 1.0" to "foo 1.0 -> 1.1" which makes cronjobs that mail the -Qu output way more helpful. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- src/pacman/query.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index c9c82b9..a8499c0 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -318,8 +318,11 @@ static int display(alpm_pkg_t *pkg) && !config->op_q_changelog && !config->op_q_check) { if(!config->quiet) { const colstr_t *colstr = &config->colstr; - printf("%s%s %s%s%s\n", colstr->title, alpm_pkg_get_name(pkg), - colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); + alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle)); + + printf("%s%s %s%s%s -> %s%s%s\n", colstr->title, alpm_pkg_get_name(pkg), + colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor, + colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor); } else { printf("%s\n", alpm_pkg_get_name(pkg)); } -- 1.8.4

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-133-g8eb8995
by allan＠archlinux.org 19 Sep '13

19 Sep '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 8eb8995aa762c8eded8db4041a11d330094795fd (commit) via d1ac6ffc1399df928d768068231576b2ac3f5abe (commit) from 2379eb1fa629eebd9de8c1a542734243ff2ef471 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8eb8995aa762c8eded8db4041a11d330094795fd Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Sep 18 14:29:07 2013 -0400 TESTS: add missing tests Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d1ac6ffc1399df928d768068231576b2ac3f5abe Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Sep 18 14:27:00 2013 -0400 Fix make distcheck * set util binary paths relative to top_builddir * set pactest.py path relative to top_srcdir * include tap.py in check_SCRIPTS Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 4 ++-- test/pacman/Makefile.am | 1 + test/pacman/tests/TESTS | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] make distcheck fails - new test framework?
by Allan McRae 18 Sep '13

18 Sep '13

Hi, I have just noticed that "make distcheck" is failing in the check part: make --no-print-directory check-TESTS FAIL: test/util/pacsorttest.sh FAIL: test/util/vercmptest.sh ERROR: test/pacman/tests/clean001.py - missing test plan ERROR: test/pacman/tests/clean001.py - exited with status 127 (command not found?) ERROR: test/pacman/tests/clean002.py - missing test plan ERROR: test/pacman/tests/clean002.py - exited with status 127 (command not found?) PASS: test/scripts/parseopts_test.sh ERROR: test/pacman/tests/clean004.py - missing test plan ERROR: test/pacman/tests/clean004.py - exited with status 127 (command not found?) ERROR: test/pacman/tests/clean003.py - missing test plan ERROR: test/pacman/tests/clean003.py - exited with status 127 (command not found I'm guessing we are missing something needed for the test framework. @Andrew: any chance you can take a look? Allan

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-131-g2379eb1
by allan＠archlinux.org 18 Sep '13

18 Sep '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 2379eb1fa629eebd9de8c1a542734243ff2ef471 (commit) via 028490ddcf2dcf4130da6d50ce1adbc8dba17c03 (commit) via 5ef0c3caa56f696f32384a7bc90555bc369cd68a (commit) via 8561ad225672f57336fee357fa5d1f4f5a172870 (commit) via ec15e859a4e69681cf6d1a5808ecc8a619e91a55 (commit) via 3b3152fc501a1561d733c33557ff2f7be8376067 (commit) via 3f99cfba1b6ef1c5665488b651a3d6409730fa98 (commit) via 93888089643b017390538d1f6f3a2d2aa9918851 (commit) via de570d1a65a24dfc53797d4a53e2ff82ec814ab3 (commit) via 2091f7ab163926cdc6e6d5bfb1195ff36a6119a4 (commit) via cfbc4fe8098dd992258648470b76d2dce081af01 (commit) from 61e806b96a8828152e78ab9eff03c490a23b22e9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2379eb1fa629eebd9de8c1a542734243ff2ef471 Author: Xyne <xyne(a)archlinux.ca> Date: Wed Sep 18 03:01:23 2013 +0000 makepkg: redirect downloader output to STDERR This allows scripts to safely capture the output of "makepkg -g". Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 028490ddcf2dcf4130da6d50ce1adbc8dba17c03 Author: Xyne <xyne(a)archlinux.ca> Date: Tue Sep 17 15:31:17 2013 +0000 makepkg: include all hash types in integlist Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5ef0c3caa56f696f32384a7bc90555bc369cd68a Author: Xyne <xyne(a)archlinux.ca> Date: Tue Sep 17 09:19:26 2013 +0000 bacman: optionally include unmodified backup files when available Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8561ad225672f57336fee357fa5d1f4f5a172870 Author: Xyne <xyne(a)archlinux.ca> Date: Tue Sep 17 09:19:25 2013 +0000 bacman: update copyright information in version function Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ec15e859a4e69681cf6d1a5808ecc8a619e91a55 Author: Xyne <xyne(a)archlinux.ca> Date: Tue Sep 17 09:19:24 2013 +0000 bacman: pass unshifted arguments to fakeroot Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3b3152fc501a1561d733c33557ff2f7be8376067 Author: Christian Hesse <mail(a)eworm.de> Date: Thu Sep 5 16:08:23 2013 +0200 dload: avoid renaming files downloaded via sync operations If the server redirects from ${repo}.db to ${repo}.db.tar.gz pacman gets this wrong: It saves to new filename and fails when accessing ${repo}.db. We need the remote filename only when downloading remote files with pacman's -U operation. This introduces a new field 'trust_remote_name' to payload. If set pacman downloads to the filename given by the server. The field trust_remote_name is set in alpm_fetch_pkgurl(). Fixes FS#36791 ([pacman] downloads to wrong filename with redirect). [dave: remove redundant assignment leading to memory leak] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3f99cfba1b6ef1c5665488b651a3d6409730fa98 Author: Aaron Lindsay <aaron(a)aclindsay.com> Date: Thu Sep 5 14:46:29 2013 -0400 contrib: Unify quoting in error messages This fixes error messages to display the contents of variables rather than the variable name by replacing backticks with single quotes (m4 eats backticks). It also removes $"" localization from error messages to eliminate security holes. For instance, `rankmirrors nonexistent_file' will now display: 'nonexistent_file' does not exist. rather than: $1 does not exist. Signed-off-by: Aaron Lindsay <aaron(a)aclindsay.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 93888089643b017390538d1f6f3a2d2aa9918851 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 3 20:03:04 2013 -0400 makepkg: use c-style for loops for integrity checks These loops already maintain an independent loop counter, so cut out the middle man. While this change doesn't necessarily require that we drop support for sparse arrays, we do via this patch. A new lint check is added in check_sanity to abort when a sparse array is encountered. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit de570d1a65a24dfc53797d4a53e2ff82ec814ab3 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 3 18:12:53 2013 -0400 makepkg: always use read's -r flag with filenames These are all cases where we're reading filenames -- any backslashes are intentional and should not be interpreted. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2091f7ab163926cdc6e6d5bfb1195ff36a6119a4 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 3 15:47:10 2013 -0400 makepkg: inline creation of checksum indenting With some simple math and printf formatting tokens, we can create the whitespace necessary for this without the need for a loop and string concatentation. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cfbc4fe8098dd992258648470b76d2dce081af01 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 2 16:50:08 2013 -0400 makepkg: cleanup a few format string injections Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.sh.in | 87 ++++++++++++++++++++++++++++++++++------------- contrib/rankmirrors.sh.in | 10 +++--- contrib/updpkgsums.sh.in | 2 +- lib/libalpm/dload.c | 38 ++++++++++++--------- lib/libalpm/dload.h | 1 + scripts/makepkg.sh.in | 86 +++++++++++++++++++++------------------------- 6 files changed, 131 insertions(+), 93 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] updpkgsums: omit downloader output when capturing checksums
by Xyne 18 Sep '13

18 Sep '13

Download the source files with an invocation of makepkg before capturing the output of makepkg -g. Without this, data printed to STDOUT by the downloader is included in the PKGBUILD. --- contrib/updpkgsums.sh.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index ffea96b..760c414 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -72,6 +72,9 @@ if [[ ! -w . ]]; then fi { + # Download sources first to avoid downloader output in newsums array below. + makepkg --verifysource -dp "$buildfile" >/dev/null 2>&1 + # Generate the new sums and try to unlink the file before writing stdin back # into it. This final precaution shouldn't fail based on the previous checks, # but it's better to be extra careful before unlinking files. -- 1.8.4

3 18