- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Suppress repeated dependency resolving error messages
by Allan McRae 17 Sep '12

17 Sep '12

When hitting an unresolvable dependency, pacman will output a message like: warning: cannot resolve "glibc>=1.0-2", a dependency of "gcc-libs" This currently is repeated every time the package with the unresolvable dependency is seen during dependency resolution. Limit this to printing the output once. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/deps.c | 13 ++++++++----- lib/libalpm/deps.h | 2 +- lib/libalpm/sync.c | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 6841097..d218f0b 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -715,6 +715,7 @@ alpm_pkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_handle_t *handle, * transaction * @param data returns the dependency which could not be satisfied in the * event of an error + * @param quiet suppress missing dependency warnings * @return 0 on success, with [pkg] and all of its dependencies not already on * the [*packages] list added to that list, or -1 on failure due to an * unresolvable dependency, in which case the [*packages] list will be @@ -722,7 +723,7 @@ alpm_pkg_t SYMEXPORT *alpm_find_dbs_satisfier(alpm_handle_t *handle, */ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, - alpm_list_t *rem, alpm_list_t **data) + alpm_list_t *rem, alpm_list_t **data, int quiet) { int ret = 0; alpm_list_t *j; @@ -763,7 +764,7 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, /* find a satisfier package in the given repositories */ spkg = resolvedep(handle, missdep, handle->dbs_sync, *packages, 0); } - if(spkg && _alpm_resolvedeps(handle, localpkgs, spkg, preferred, packages, rem, data) == 0) { + if(spkg && _alpm_resolvedeps(handle, localpkgs, spkg, preferred, packages, rem, data, 1) == 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "pulling dependency %s (needed by %s)\n", spkg->name, pkg->name); @@ -773,9 +774,11 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, } else { handle->pm_errno = ALPM_ERR_UNSATISFIED_DEPS; char *missdepstring = alpm_dep_compute_string(missdep); - _alpm_log(handle, ALPM_LOG_WARNING, - _("cannot resolve \"%s\", a dependency of \"%s\"\n"), - missdepstring, pkg->name); + if(!quiet) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("cannot resolve \"%s\", a dependency of \"%s\"\n"), + missdepstring, pkg->name); + } free(missdepstring); if(data) { *data = alpm_list_add(*data, miss); diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index c8e1bc3..7470ea1 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -34,7 +34,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_handle_t *handle, alpm_list_t *targets, int r int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit); int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, - alpm_list_t **data); + alpm_list_t **data, int quiet); alpm_depend_t *_alpm_splitdep(const char *depstring); int _alpm_depcmp_literal(alpm_pkg_t *pkg, alpm_depend_t *dep); int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index ca6b507..634d7cd 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -409,7 +409,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) for(i = trans->add; i; i = i->next) { alpm_pkg_t *pkg = i->data; if(_alpm_resolvedeps(handle, localpkgs, pkg, trans->add, - &resolved, remove, data) == -1) { + &resolved, remove, data, 0) == -1) { unresolvable = alpm_list_add(unresolvable, pkg); } /* Else, [resolved] now additionally contains [pkg] and all of its -- 1.7.12

1 1

[pacman-dev] [PATCH] pactest: allow running with valgrind from any directory
by Allan McRae 17 Sep '12

17 Sep '12

When using the --valgrind flag with the pactest.py script, the path to the suppression file relies on the script being called from the source root directory. Construct the path from the scripts location to allow it to be called from directory. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/pmtest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 1a02686..625dccd 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -205,7 +205,8 @@ def run(self, pacman): if pacman["valgrind"]: cmd.extend(["libtool", "execute", "valgrind", "-q", "--tool=memcheck", "--leak-check=full", - "--show-reachable=yes", "--suppressions=%s/valgrind.supp" % os.getcwd()]) + "--show-reachable=yes", + "--suppressions=%s" % os.path.join(os.path.dirname( __file__ ), '..', '..', 'valgrind.supp') ]) cmd.extend([pacman["bin"], "--config", os.path.join(self.root, util.PACCONF), "--root", self.root, -- 1.7.12

1 0

[pacman-dev] [PATCH] makepkg: use last match in BUILDENV/OPTIONS array
by Allan McRae 17 Sep '12

17 Sep '12

Using the last match in the BUILDENV and OPTIONS arrays allows the user to easily override these values without specifying the entire array. For example add "BUILDENV+=(sign)" in ~/.makepkg.conf. Fixes FS#26701. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 6 ++++-- scripts/makepkg.sh.in | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 3dbaea1..cf9da73 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -81,7 +81,8 @@ Options This array contains options that affect the build environment, the defaults are shown here. All options should always be left in the array; to enable or disable an option simply remove or place an ``!'' at the front of the - option. Each works as follows: + option. If an option is specified multiple times, the final value takes + precedence. Each option works as follows: *fakeroot*;; Allow building packages as a non-root user. This is highly recommended. @@ -134,7 +135,8 @@ Options equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or disable an option simply remove or place an ``!'' at the front of the - option. Each works as follows: + option. If an option is specified multiple times, the final value takes + precedence. Each option works as follows: *strip*;; Strip symbols from binaries and libraries. If you frequently use a diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d387b7d..fce7558 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -830,8 +830,9 @@ check_buildenv() { in_opt_array() { local needle=$1; shift - local opt - for opt in "$@"; do + local i opt + for (( i = $#; i > 0; i-- )); do + opt=${!i} if [[ $opt = "$needle" ]]; then # enabled return 0 -- 1.7.12

1 0

[pacman-dev] [PATCH] Document system and user specific makepkg.conf
by Allan McRae 17 Sep '12

17 Sep '12

Add details of the system wide and user specific versions of makepkg.conf to the man page. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index de2b4b4..3dbaea1 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -25,6 +25,10 @@ build environment. NOTE: This does not guarantee that all package Makefiles will use your exported variables. Some of them are non-standard. +The system-wide configuration file is found in {sysconfdir}/makepkg.conf. +Individual options can be overridden (or added to) on a per user basis in +~/.makepkg.conf. + The default file is fairly well commented, so it may be easiest to simply follow directions given there for customization. -- 1.7.12

1 0

[pacman-dev] [PATCH] Fix overzealous package removal with unmet dependencies
by Allan McRae 17 Sep '12

17 Sep '12

From: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> [Allan: Remove expected failure from fixed pactests] Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/deps.c | 82 ++++++++++++++++++------------------ test/pacman/tests/sync140.py | 2 - test/pacman/tests/sync141.py | 2 - test/pacman/tests/unresolvable001.py | 2 - 4 files changed, 41 insertions(+), 47 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 2a06bb0..6841097 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -725,7 +725,7 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_list_t *rem, alpm_list_t **data) { int ret = 0; - alpm_list_t *i, *j; + alpm_list_t *j; alpm_list_t *targ; alpm_list_t *deps = NULL; alpm_list_t *packages_copy; @@ -742,49 +742,49 @@ int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, *packages = alpm_list_add(*packages, pkg); _alpm_log(handle, ALPM_LOG_DEBUG, "started resolving dependencies\n"); - for(i = alpm_list_last(*packages); i; i = i->next) { - alpm_pkg_t *tpkg = i->data; - targ = alpm_list_add(NULL, tpkg); - deps = alpm_checkdeps(handle, localpkgs, rem, targ, 0); - alpm_list_free(targ); - - for(j = deps; j; j = j->next) { - alpm_depmissing_t *miss = j->data; - alpm_depend_t *missdep = miss->depend; - /* check if one of the packages in the [*packages] list already satisfies - * this dependency */ - if(find_dep_satisfier(*packages, missdep)) { - _alpm_depmiss_free(miss); - continue; - } - /* check if one of the packages in the [preferred] list already satisfies - * this dependency */ - alpm_pkg_t *spkg = find_dep_satisfier(preferred, missdep); - if(!spkg) { - /* find a satisfier package in the given repositories */ - spkg = resolvedep(handle, missdep, handle->dbs_sync, *packages, 0); - } - if(!spkg) { - handle->pm_errno = ALPM_ERR_UNSATISFIED_DEPS; - char *missdepstring = alpm_dep_compute_string(missdep); - _alpm_log(handle, ALPM_LOG_WARNING, - _("cannot resolve \"%s\", a dependency of \"%s\"\n"), - missdepstring, tpkg->name); - free(missdepstring); - if(data) { - *data = alpm_list_add(*data, miss); - } - ret = -1; - } else { - _alpm_log(handle, ALPM_LOG_DEBUG, - "pulling dependency %s (needed by %s)\n", - spkg->name, tpkg->name); - *packages = alpm_list_add(*packages, spkg); - _alpm_depmiss_free(miss); + targ = alpm_list_add(NULL, pkg); + deps = alpm_checkdeps(handle, localpkgs, rem, targ, 0); + alpm_list_free(targ); + targ = NULL; + + for(j = deps; j; j = j->next) { + alpm_depmissing_t *miss = j->data; + alpm_depend_t *missdep = miss->depend; + /* check if one of the packages in the [*packages] list already satisfies + * this dependency */ + if(find_dep_satisfier(*packages, missdep)) { + _alpm_depmiss_free(miss); + continue; + } + /* check if one of the packages in the [preferred] list already satisfies + * this dependency */ + alpm_pkg_t *spkg = find_dep_satisfier(preferred, missdep); + if(!spkg) { + /* find a satisfier package in the given repositories */ + spkg = resolvedep(handle, missdep, handle->dbs_sync, *packages, 0); + } + if(spkg && _alpm_resolvedeps(handle, localpkgs, spkg, preferred, packages, rem, data) == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "pulling dependency %s (needed by %s)\n", + spkg->name, pkg->name); + _alpm_depmiss_free(miss); + } else if(resolvedep(handle, missdep, (targ = alpm_list_add(NULL, handle->db_local)), rem, 0)) { + _alpm_depmiss_free(miss); + } else { + handle->pm_errno = ALPM_ERR_UNSATISFIED_DEPS; + char *missdepstring = alpm_dep_compute_string(missdep); + _alpm_log(handle, ALPM_LOG_WARNING, + _("cannot resolve \"%s\", a dependency of \"%s\"\n"), + missdepstring, pkg->name); + free(missdepstring); + if(data) { + *data = alpm_list_add(*data, miss); } + ret = -1; } - alpm_list_free(deps); } + alpm_list_free(targ); + alpm_list_free(deps); if(ret != 0) { alpm_list_free(*packages); diff --git a/test/pacman/tests/sync140.py b/test/pacman/tests/sync140.py index d20da98..ce21cc3 100644 --- a/test/pacman/tests/sync140.py +++ b/test/pacman/tests/sync140.py @@ -24,5 +24,3 @@ self.addrule("PKG_VERSION=glibc|1.0-1") self.addrule("PKG_VERSION=gcc-libs|1.0-1") self.addrule("PKG_VERSION=pcre|1.0-2") - -self.expectfailure = True diff --git a/test/pacman/tests/sync141.py b/test/pacman/tests/sync141.py index b2c996e..f2f0136 100644 --- a/test/pacman/tests/sync141.py +++ b/test/pacman/tests/sync141.py @@ -24,5 +24,3 @@ self.addrule("PKG_VERSION=c_glibc|1.0-1") self.addrule("PKG_VERSION=b_gcc-libs|1.0-1") self.addrule("PKG_VERSION=a_pcre|1.0-2") - -self.expectfailure = True diff --git a/test/pacman/tests/unresolvable001.py b/test/pacman/tests/unresolvable001.py index c98a4c0..9d54c3e 100644 --- a/test/pacman/tests/unresolvable001.py +++ b/test/pacman/tests/unresolvable001.py @@ -17,5 +17,3 @@ self.addrule("PKG_EXIST=package") self.addrule("PKG_EXIST=dep") self.addrule("PKG_VERSION=dep|1.0-1") - -self.expectfailure = True -- 1.7.12

1 0

[pacman-dev] [WIP] Fix for overzealous package removal with unmet dependencies
by Allan McRae 16 Sep '12

16 Sep '12

Here goes a WIP patch for FS#30649. It fixes one the sync140.py testcase just sent to the mailing list, but not sync141.py - it works only when the root cause of the excess dependency removal is first in the upgraded package list. If anyone has an idea for how to get it fully fixed, I would appreciate the help. Allan diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 841e5d6..65a8f52 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -406,14 +406,29 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* Resolve packages in the transaction one at a time, in addition building up a list of packages which could not be resolved. */ - for(i = trans->add; i; i = i->next) { + + i = trans->add; + while(i != NULL) { alpm_pkg_t *pkg = i->data; if(_alpm_resolvedeps(handle, localpkgs, pkg, trans->add, &resolved, remove, data) == -1) { unresolvable = alpm_list_add(unresolvable, pkg); + + /* remove the unresolvable package from the upgrade + list and recalculate localpkgs to allow the a local + version to satisfy future deps */ + + i = i->next; + trans->add = alpm_list_remove(trans->add, pkg, + _alpm_pkg_cmp, NULL); + localpkgs = alpm_list_diff( + _alpm_db_get_pkgcache(handle->db_local), + trans->add, _alpm_pkg_cmp); + } else { + /* [resolved] now additionally contains [pkg] and all of its + dependencies not already on the list */ + i = i->next; } - /* Else, [resolved] now additionally contains [pkg] and all of its - dependencies not already on the list */ } alpm_list_free(localpkgs); alpm_list_free(remove);

1 0

[pacman-dev] [PATCH 2/2] pactest: variant of package removal due to unmet dependencies
by Allan McRae 16 Sep '12

16 Sep '12

Duplicate of sync140.py but with the alphabetical ordering of the packages changed. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/tests/sync141.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 test/pacman/tests/sync141.py diff --git a/test/pacman/tests/sync141.py b/test/pacman/tests/sync141.py new file mode 100644 index 0000000..b2c996e --- /dev/null +++ b/test/pacman/tests/sync141.py @@ -0,0 +1,28 @@ +self.description = "Sysupgrade with ignored package prevent other upgrade" + +lp1 = pmpkg("c_glibc", "1.0-1") +lp2 = pmpkg("b_gcc-libs", "1.0-1") +lp2.depends = ["c_glibc>=1.0-1"] +lp3 = pmpkg("a_pcre", "1.0-1") +lp3.depends = ["b_gcc-libs"] + +for p in lp1, lp2, lp3: + self.addpkg2db("local", p) + +sp1 = pmpkg("c_glibc", "1.0-2") +sp2 = pmpkg("b_gcc-libs", "1.0-2") +sp2.depends = ["c_glibc>=1.0-2"] +sp3 = pmpkg("a_pcre", "1.0-2") +sp3.depends = ["b_gcc-libs"] + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p) + +self.args = "-Su --ignore %s --ask=32" % sp1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=c_glibc|1.0-1") +self.addrule("PKG_VERSION=b_gcc-libs|1.0-1") +self.addrule("PKG_VERSION=a_pcre|1.0-2") + +self.expectfailure = True -- 1.7.12

1 0

[pacman-dev] [PATCH 1/2] pactest: removal of packages with unmet dependencies
by Allan McRae 16 Sep '12

16 Sep '12

Provide a package for removing packages with unmet dependencies. Currently pacman removes too many packages from the transaction (FS#30649). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/tests/sync140.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 test/pacman/tests/sync140.py diff --git a/test/pacman/tests/sync140.py b/test/pacman/tests/sync140.py new file mode 100644 index 0000000..d20da98 --- /dev/null +++ b/test/pacman/tests/sync140.py @@ -0,0 +1,28 @@ +self.description = "Sysupgrade with ignored package prevent other upgrade" + +lp1 = pmpkg("glibc", "1.0-1") +lp2 = pmpkg("gcc-libs", "1.0-1") +lp2.depends = ["glibc>=1.0-1"] +lp3 = pmpkg("pcre", "1.0-1") +lp3.depends = ["gcc-libs"] + +for p in lp1, lp2, lp3: + self.addpkg2db("local", p) + +sp1 = pmpkg("glibc", "1.0-2") +sp2 = pmpkg("gcc-libs", "1.0-2") +sp2.depends = ["glibc>=1.0-2"] +sp3 = pmpkg("pcre", "1.0-2") +sp3.depends = ["gcc-libs"] + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p) + +self.args = "-Su --ignore %s --ask=32" % sp1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=glibc|1.0-1") +self.addrule("PKG_VERSION=gcc-libs|1.0-1") +self.addrule("PKG_VERSION=pcre|1.0-2") + +self.expectfailure = True -- 1.7.12

1 0

[pacman-dev] [PATCH 1/2] makepkg: Bazaar VCS support.
by Gary van der Merwe 13 Sep '12

13 Sep '12

This patch adds Bazaar VCS support to makepkg. Fragments can be any bzr revision spec. eg: http://example.com/project/#revno:62 or just http://example.com/project/#62 For more info, see `bzr help revisionspec`. Writing a pkgver func is easy with `bzr version-info`, eg: pkgver() { cd $srcdir/$pkgname bzr version-info --custom --template="{revno}\n" } --- doc/PKGBUILD.5.txt | 5 ++++- scripts/makepkg.sh.in | 60 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 47f9e88..c0f96c2 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -405,7 +405,7 @@ Using VCS Sources[[VCS]] ------------------------ Building a developmental version of a package using sources from a version control system (VCS) is enabled by specifying the source in the form -`source=('folder::url#fragment')`. Currently makepkg supports the `git`, `hg` and +`source=('folder::url#fragment')`. Currently makepkg supports the `git`, `hg`, `bzr` and `svn` protocols. The source URL is divided into three components: @@ -433,6 +433,9 @@ The source URL is divided into three components: *hg*;; branch, revision, tag + *bzr*;; + revisionspec (see `bzr help revisionspec` for details) + *svn*;; revision diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dd4066b..3460824 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -200,7 +200,7 @@ get_filepath() { local proto="$(get_protocol "$1")" case $proto in - git*|hg*|svn*) + git*|hg*|svn*|bzr*) if [[ -d "$startdir/$file" ]]; then file="$startdir/$file" elif [[ -d "$SRCDEST/$file" ]]; then @@ -236,7 +236,7 @@ get_filename() { local proto=$(get_protocol "$netfile") case $proto in - git*|hg*|svn*) + git*|hg*|svn*|bzr*) filename=${netfile##*/} filename=${filename%%#*} # fall-through @@ -572,6 +572,57 @@ download_svn() { popd &>/dev/null } +download_bzr() { + local netfile=$1 + + local url=$(get_url "$netfile") + url=${url##*bzr+} + url=${url%%#*} + + local fragment=${netfile##*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + local revisionspec="-r-1" + local displaylocation="$url" + else + local revisionspec="-r$fragment" + local displaylocation="$url -r $fragment" + fi + + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + if [[ ! -d "$dir" ]]; then + msg2 "$(gettext "Branching %s ...")" "${displaylocation}" + if ! bzr branch "$url" "$dir" $revisionspec --no-tree; then + error "$(gettext "Failure while branching %s")" "${displaylocation}" + plain "$(gettext "Aborting...")" + exit 1 + fi + elif (( ! HOLDVER )); then + msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" + cd_safe "$dir" + if ! bzr pull "$url" $revisionspec --overwrite; then + # only warn on failure to allow offline builds + warning "$(gettext "Failure while pulling %s")" "${displaylocation}" + fi + fi + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${dir}" "bzr" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" + + if ! bzr checkout "$dir" --lightweight; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${dir}" "bzr" + plain "$(gettext "Aborting...")" + exit 1 + fi + + cd_safe "${dir##*/}" + + popd &>/dev/null +} + download_sources() { msg "$(gettext "Retrieving Sources...")" @@ -602,6 +653,9 @@ download_sources() { svn*) (( GET_VCS )) && download_svn "$netfile" ;; + bzr*) + (( GET_VCS )) && download_bzr "$netfile" + ;; *) error "$(gettext "Unknown download protocol: %s")" "$proto" plain "$(gettext "Aborting...")" @@ -974,7 +1028,7 @@ generate_checksums() { proto="$(get_protocol "$netfile")" case $proto in - git*|hg*|svn*) + git*|hg*|svn*|bzr*) sum="SKIP" ;; *) -- 1.7.11.4

2 10

[pacman-dev] [PATCH] Remove leading "./" from filenames in mtree file
by Allan McRae 09 Sep '12

09 Sep '12

A properly formatted mtree file may stick a leading "./" in front of file names in the root directory. Strip this if present. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Sending for completeness. The full mtree patchset can be seen at https://patchwork.archlinux.org/user/bundle/8/?state=* The whole patchset requires libarchives mtree generation to be fixed using this patch: https://github.com/allanbrokeit/libarchive/commit/32675a90 src/pacman/check.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pacman/check.c b/src/pacman/check.c index d325a99..2ccf51d 100644 --- a/src/pacman/check.c +++ b/src/pacman/check.c @@ -242,6 +242,11 @@ int check_pkg_full(alpm_pkg_t *pkg) mode_t type; size_t file_errors = 0; + /* strip leading "./" from path entries */ + if(path[0] == '.' && path[1] == '/') { + path += 2; + } + if(strcmp(path, ".INSTALL") == 0) { char filename[PATH_MAX]; snprintf(filename, PATH_MAX, "%slocal/%s-%s/install", -- 1.7.12

1 0