- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Remove duplicates from the unresolvable list before prompting user
by bji-keyword-pacman.3644cb＠www.ischo.com 08 Mar '09

08 Mar '09

From: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Signed-off-by: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> --- lib/libalpm/sync.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index fca96d8..cac6783 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -444,6 +444,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync /* If there were unresolvable top-level packages, prompt the user to see if they'd like to ignore them rather than failing the sync */ if(unresolvable != NULL) { + unresolvable = alpm_list_remove_dupes(unresolvable); int remove_unresolvable = 0; QUESTION(handle->trans, PM_TRANS_CONV_REMOVE_PKGS, unresolvable, NULL, NULL, &remove_unresolvable); -- 1.6.1.3

1 0

[pacman-dev] [PATCH] Look in target-list first to resolve dependencies
by bji-keyword-pacman.3644cb＠www.ischo.com 08 Mar '09

08 Mar '09

From: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> This fixes a bug introduced by my previous changes which changes the behavior of IgnorePkg/IgnoreGroup to allow the user to remove unresolvable packages from the transaction. The bug is that the target-list was no longer being consulted first to resolve dependencies, which means that if two packages in the sync database satisfied a dependency, and the user explicitly requested one of those two packages in the sync, the other package was still being pulled in. A new test was added, sync993.py, to verify the desired behavior. Signed-off-by: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> --- lib/libalpm/deps.c | 20 ++++++++++++-------- lib/libalpm/deps.h | 3 ++- lib/libalpm/sync.c | 7 ++++--- pactest/tests/sync993.py | 20 ++++++++++++++++++++ 4 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 pactest/tests/sync993.py diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 694e5be..0faa221 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -582,8 +582,8 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, * unmodified by this function */ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, - alpm_list_t **packages, alpm_list_t *remove, - alpm_list_t **data) + alpm_list_t *preferred, alpm_list_t **packages, + alpm_list_t *remove, alpm_list_t **data) { alpm_list_t *i, *j; alpm_list_t *targ; @@ -620,17 +620,21 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, if(_alpm_find_dep_satisfier(*packages, missdep)) { continue; } - /* find a satisfier package in the given repositories */ - pmpkg_t *spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, 0); + /* check if one of the packages in the [preferred] list already satisfies this dependency */ + pmpkg_t *spkg = _alpm_find_dep_satisfier(preferred, missdep); + if(!spkg) { + /* find a satisfier package in the given repositories */ + spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, 0); + } if(!spkg) { pm_errno = PM_ERR_UNSATISFIED_DEPS; char *missdepstring = alpm_dep_compute_string(missdep); _alpm_log(PM_LOG_WARNING, _("cannot resolve \"%s\", a dependency of \"%s\"\n"), - missdepstring, tpkg->name); + missdepstring, tpkg->name); free(missdepstring); if(data) { pmdepmissing_t *missd = _alpm_depmiss_new(miss->target, - miss->depend, miss->causingpkg); + miss->depend, miss->causingpkg); if(missd) { *data = alpm_list_add(*data, missd); } @@ -640,9 +644,9 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free(deps); return(-1); - } else { + } else { _alpm_log(PM_LOG_DEBUG, "pulling dependency %s (needed by %s)\n", - alpm_pkg_get_name(spkg), alpm_pkg_get_name(tpkg)); + alpm_pkg_get_name(spkg), alpm_pkg_get_name(tpkg)); *packages = alpm_list_add(*packages, spkg); } } diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index eb1400b..94847d8 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -49,7 +49,8 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, int reverse); void _alpm_recursedeps(pmdb_t *db, alpm_list_t *targs, int include_explicit); pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *excluding, int prompt); int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, - alpm_list_t **packages, alpm_list_t *remove, alpm_list_t **data); + alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, + alpm_list_t **data); int _alpm_dep_edge(pmpkg_t *pkg1, pmpkg_t *pkg2); pmdepend_t *_alpm_splitdep(const char *depstring); pmpkg_t *_alpm_find_dep_satisfier(alpm_list_t *pkgs, pmdepend_t *dep); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index fca96d8..b504a42 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -396,7 +396,7 @@ static int compute_download_size(pmpkg_t *newpkg) int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data) { - alpm_list_t *deps = NULL; + alpm_list_t *deps = NULL, *preferred = NULL; alpm_list_t *list = NULL, *remove = NULL; /* allow checkdeps usage with trans->packages */ alpm_list_t *unresolvable = NULL; alpm_list_t *i, *j; @@ -422,19 +422,20 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_START, NULL, NULL); _alpm_log(PM_LOG_DEBUG, "resolving target's dependencies\n"); - /* build remove list for resolvedeps */ + /* build remove list and preferred list for resolvedeps */ for(i = trans->packages; i; i = i->next) { pmsyncpkg_t *sync = i->data; for(j = sync->removes; j; j = j->next) { remove = alpm_list_add(remove, j->data); } + preferred = alpm_list_add(preferred, sync->pkg); } /* Resolve packages in the transaction one at a time, in addtion building up a list of packages which could not be resolved. */ for(i = trans->packages; i; i = i->next) { pmpkg_t *pkg = ((pmsyncpkg_t *) i->data)->pkg; - if(_alpm_resolvedeps(db_local, dbs_sync, pkg, &list, remove, data) == -1) { + if(_alpm_resolvedeps(db_local, dbs_sync, pkg, preferred, &list, remove, data) == -1) { unresolvable = alpm_list_add(unresolvable, pkg); } /* Else, [list] now additionally contains [pkg] and all of its diff --git a/pactest/tests/sync993.py b/pactest/tests/sync993.py new file mode 100644 index 0000000..82cc803 --- /dev/null +++ b/pactest/tests/sync993.py @@ -0,0 +1,20 @@ +self.description = "Choose a dependency satisfier (target-list vs. database)" + +sp1 = pmpkg("pkg1") +sp1.depends = ["dep"] + +sp2 = pmpkg("pkg2") +sp2.provides = ["dep"] + +sp3 = pmpkg("pkg3") +sp3.provides = ["dep"] + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p) + +self.args = "-S pkg1 pkg3" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=pkg3") -- 1.6.1.3

1 0

[pacman-dev] [PATCH] Fixed a memory leak when unresolved packages are removed from transaction
by bji-keyword-pacman.3644cb＠www.ischo.com 07 Mar '09

07 Mar '09

From: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> Signed-off-by: Bryan Ischo <bji-keyword-pacman.3644cb(a)www.ischo.com> --- lib/libalpm/sync.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index fca96d8..fe4eded 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -431,7 +431,10 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } /* Resolve packages in the transaction one at a time, in addtion - building up a list of packages which could not be resolved. */ + building up a list of packages which could not be resolved. + The list which is created by this loop is used later to replace + trans->packages; the unresolvable packages which were in the old + trans->packages list but not in the new list are freed up later. */ for(i = trans->packages; i; i = i->next) { pmpkg_t *pkg = ((pmsyncpkg_t *) i->data)->pkg; if(_alpm_resolvedeps(db_local, dbs_sync, pkg, &list, remove, data) == -1) { @@ -500,6 +503,22 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } } alpm_list_free(sortlist); + + /* Destroy all packages which are in trans->packages but not in + newpkgs before replacing trans->packages with newpkgs */ + for(i = trans->packages; i; i = i->next) { + pmsyncpkg_t *spkg = (pmsyncpkg_t *) i->data; + for (j = newpkgs; j; j = j->next) { + if(_alpm_pkg_cmp(spkg->pkg, ((pmsyncpkg_t *) j->data)->pkg) == 0) { + spkg = NULL; + break; + } + } + if (spkg != NULL) { + _alpm_sync_free(spkg); + } + } + alpm_list_free(trans->packages); trans->packages = newpkgs; -- 1.6.1.3

3 2

[pacman-dev] [PATCH] Fix error handling in _alpm_resolvedeps
by Nagy Gabor 07 Mar '09

07 Mar '09

>From 816e0ec31278ff9e94b0d8dcdea24dadb5e4fa1b Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 6 Mar 2009 17:02:19 +0100 Subject: [PATCH] Fix error handling in _alpm_resolvedeps Now resolvedeps is just a helper function for sync_prepare, so we set pm_errno in sync_prepare. We free *data list, when user decided to remove unresolvable targets. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 1 - lib/libalpm/sync.c | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 36f4d35..7a46692 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -635,7 +635,6 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, /* find a satisfier package in the given repositories */ pmpkg_t *spkg = _alpm_resolvedep(missdep, dbs_sync, *packages, 0); if(!spkg) { - pm_errno = PM_ERR_UNSATISFIED_DEPS; char *missdepstring = alpm_dep_compute_string(missdep); _alpm_log(PM_LOG_WARNING, _("cannot resolve \"%s\", a dependency of \"%s\"\n"), missdepstring, tpkg->name); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 84a18e2..14cf42e 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -456,9 +456,14 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync dependency-reordered list below */ alpm_list_free(unresolvable); unresolvable = NULL; + if(data) { + alpm_list_free_inner(*data, (alpm_list_fn_free)_alpm_depmiss_free); + alpm_list_free(*data); + *data = NULL; + } } else { - /* pm_errno is set by resolvedeps */ + pm_errno = PM_ERR_UNSATISFIED_DEPS; ret = -1; goto cleanup; } -- 1.6.0.3

1 1

[pacman-dev] [PATCH] makepkg: add pkgbase variable
by Allan McRae 06 Mar '09

06 Mar '09

The pkgbase variable is added to improve informational output and source package naming when using split packages. Defaults to ${pkgname[0]} if not set. Also: - move splitpkg detection to after pkgname presence is verified - add "cd" line to package_foo() functions in splitpkg proto Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Note that pkgbase is not documented as it is intended for split packages only and that is not documented yet... PKGBUILD-split.proto | 7 +++++-- scripts/makepkg.sh.in | 44 +++++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 35fb22b..0baa496 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -5,6 +5,7 @@ # Contributor: Your Name <youremail(a)domain.com> pkgname=('pkg1' 'pkg2') +pkgbase=('pkg') pkgver=VERSION pkgrel=1 pkgdesc="" @@ -20,12 +21,12 @@ replaces=() backup=() options=() install= -source=($pkgname-$pkgver.tar.gz) +source=($pkgbase-$pkgver.tar.gz) noextract=() md5sums=() #generate with 'makepkg -g' build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" ./configure --prefix=/usr make || return 1 } @@ -44,6 +45,7 @@ package_pkg1() { options=() install= + cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-pkg1 } @@ -51,5 +53,6 @@ package_pkg2() { # options and directives overrides pkgdesc="" + cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-pkg2 } diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d2cf52e..2ff98f1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -687,7 +687,7 @@ run_build() { local ret=0 if [ "$LOGGING" -eq 1 ]; then - BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-build.log" + BUILDLOG="${startdir}/${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do @@ -995,15 +995,15 @@ create_srcpackage() { fi msg "$(gettext "Creating source package...")" local srclinks="$(mktemp -d "$startdir"/srclinks.XXXXXXXXX)" - mkdir "${srclinks}"/${pkgname} + mkdir "${srclinks}"/${pkgbase} msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" - ln -s "${startdir}/${BUILDSCRIPT}" "${srclinks}/${pkgname}/" + ln -s "${startdir}/${BUILDSCRIPT}" "${srclinks}/${pkgbase}/" if [ -n "$install" ]; then if [ -f $install ]; then msg2 "$(gettext "Adding install script...")" - ln -s "${startdir}/$install" "${srclinks}/${pkgname}/" + ln -s "${startdir}/$install" "${srclinks}/${pkgbase}/" else error "$(gettext "Install script %s not found.")" "$install" fi @@ -1011,7 +1011,7 @@ create_srcpackage() { if [ -f ChangeLog ]; then msg2 "$(gettext "Adding %s...")" "ChangeLog" - ln -s "${startdir}/ChangeLog" "${srclinks}/${pkgname}" + ln -s "${startdir}/ChangeLog" "${srclinks}/${pkgbase}" fi local netfile @@ -1019,10 +1019,10 @@ create_srcpackage() { local file=$(get_filename "$netfile") if [ -f "$netfile" ]; then msg2 "$(gettext "Adding %s...")" "$netfile" - ln -s "${startdir}/$netfile" "${srclinks}/${pkgname}" + ln -s "${startdir}/$netfile" "${srclinks}/${pkgbase}" elif [ "$SOURCEONLY" -eq 2 -a -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Adding %s...")" "$file" - ln -s "$SRCDEST/$file" "${srclinks}/${pkgname}/" + ln -s "$SRCDEST/$file" "${srclinks}/${pkgbase}/" fi done @@ -1034,12 +1034,12 @@ create_srcpackage() { "$SRCEXT" ;; esac - local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" + local pkg_file="$PKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" # tar it up msg2 "$(gettext "Compressing source package...")" cd "${srclinks}" - if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgname}; then + if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgbase}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi @@ -1471,9 +1471,9 @@ if [ "$ASROOT" -eq 0 \ fi fi -unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums -unset replaces depends conflicts backup source install build makedepends -unset optdepends options noextract +unset pkgname pkgbase pkgver pkgrel pkgdesc url license groups provides +unset md5sums replaces depends conflicts backup source install build +unset makedepends optdepends options noextract if [ ! -f "$BUILDSCRIPT" ]; then if [ -t 0 ]; then @@ -1505,10 +1505,6 @@ if [ "$(type -t package)" = "function" ]; then PKGFUNC=1 fi -if [ "${#pkgname[@]}" -gt "1" ]; then - SPLITPKG=1 -fi - # check for no-no's in the build script if [ -z "$pkgname" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgname" @@ -1535,9 +1531,11 @@ if [ "$arch" = 'any' ]; then CARCH='any' fi +pkgbase=${pkgbase:-${pkgname[0]}} + if ! in_array $CARCH ${arch[@]}; then if [ "$IGNOREARCH" -eq 0 ]; then - error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH" + error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" plain "$(gettext "such as arch=('%s').")" "$CARCH" exit 1 @@ -1583,6 +1581,10 @@ unset valid_options opt known kopt devel_check devel_update +if [ "${#pkgname[@]}" -gt "1" ]; then + SPLITPKG=1 +fi + if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ -a "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then if [ "$INSTALL" -eq 1 ]; then @@ -1624,17 +1626,17 @@ if [ "$INFAKEROOT" -eq 1 ]; then exit 0 # $E_OK fi -msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" +msg "$(gettext "Making package: %s")" "$pkgbase $pkgver-$pkgrel $CARCH ($(date))" # if we are creating a source-only package, go no further if [ "$SOURCEONLY" -ne 0 ]; then - if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" \ + if [ -f "$PKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" \ -a "$FORCE" -eq 0 ]; then error "$(gettext "A package has already been built. (use -f to overwrite)")" exit 1 fi create_srcpackage - msg "$(gettext "Source package created: %s")" "$pkgname ($(date))" + msg "$(gettext "Source package created: %s")" "$pkgbase ($(date))" exit 0 fi @@ -1748,7 +1750,7 @@ else fi fi -msg "$(gettext "Finished making: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))" +msg "$(gettext "Finished making: %s")" "$pkgbase $pkgver-$pkgrel $CARCH ($(date))" install_package -- 1.6.1.3

1 0

[pacman-dev] Package upgrade 1.0.0-1 => 0.11.0-2 (qgis)
by Simon Legner 04 Mar '09

04 Mar '09

Hi, I installed QGIS 1.0.0-1 from AUR, but pacman (version 3.2.2-1) suggests a package upgrade to version 0.11.0-2 in community: warning: qgis: ignoring package upgrade (1.0.0-1 => 0.11.0-2) Is it a bug? Best regards, simon

2 3

[pacman-dev] [PATCH] Print warning in _alpm_resolvedep() if a satisfier package is ignored without QUESTION
by Nagy Gabor 04 Mar '09

04 Mar '09

>From fe694f5e78a93284a28c4afd1a9272dac565b29b Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 4 Mar 2009 20:34:06 +0100 Subject: [PATCH] Print warning in _alpm_resolvedep() if a satisfier package is ignored without QUESTION After commit f57f8d33862050acc8d131710c100ba47877e675 pacman *silently* ignores packages from IgnorePkg/IgnoreGroup during dependency resolving, if prompt == 0. This behavior is changed to "give warning + ignore". (Otherwise the user is not informed about the fact that the package resolving was blocked by ignorepkg.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/deps.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index dd5bd20..36f4d35 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -530,6 +530,8 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, if (prompt) { QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, NULL, NULL, &install); + } else { + _alpm_log(PM_LOG_WARNING, _("ignoring package %s-%s\n"), pkg->name, pkg->version); } if(!install) { ignored = 1; @@ -550,6 +552,8 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, if (prompt) { QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, NULL, NULL, &install); + } else { + _alpm_log(PM_LOG_WARNING, _("ignoring package %s-%s\n"), pkg->name, pkg->version); } if(!install) { ignored = 1; -- 1.6.0.3

1 1

[pacman-dev] [feature request] ignore certain file conflicts
by Pierre Schmitz 03 Mar '09

03 Mar '09

Hi pacman devs, Sometimes it happens that a user has to force an upgrade because pacman detects an file conflict. Some of those cases are caused by the known link vs. regular file/directory problem. Others are caused by the fact that a file wasn't tracked by pacman before. (e.g. something that was created by an install script before and is part of the package itself now) I am not sure if the first case can even be fixed at all. So what about an variable I could define in the PKGBUILD which would handle this? overwrite=('usr/lib/somefile' 'usr/lib/someotherfile') I am not sure if this is completly insane and how difficult to implement this mgiht be. -- Pierre Schmitz Clemens-August-Straße 76 53115 Bonn Telefon 0228 9716608 Mobil 0160 95269831 Jabber pierre(a)jabber.archlinux.de WWW http://www.archlinux.de

5 9

Re: [pacman-dev] [feature request] ignore certain file conflicts
by Nagy Gabor 02 Mar '09

02 Mar '09

> Nagy Gabor wrote: > >> Redux: > >> /usr/lib/zomg.so is not owned by any package. Allow foobar-1.0-2 to > >> overwrite this file? [y/N] > >> > >> Optional: > >> s/overwrite/claim ownership of/ > >> > > > > In this case we don't need overwrite option at all, right? (This can be > > detected automatically. However, this detection is slow.) > > > > I had just thought the same thing but why would it be so slow? Would > the conflict checking not already find the conflict with an unowned file > on the system and so this is just adding a query? No, fileconflict checks whether we will remove that file or not *in the transaction*, so it only considers transaction packages only, not all local packages. And see src/pacman/query.c/query_fileowner(). Briefly, the problem is that symlinks can mess things up, so we have to call realpath on localpkg->files, which is slow. However, Xavier had a clever patch which reduced realpath usage by checking basenames first, it might have made query_fileowner() much faster, I dunno. Bye

1 0

[pacman-dev] [PATCH] contrib/pacsrcipts - print install scripts from a package
by Allan McRae 02 Mar '09

02 Mar '09

Prints the install script from a given package file or from a package in the pacman repo. Original-work-by: Giulio "giulivo" Fidente <giulivo.navigante(a)gmail.com> Improvements-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/Makefile.am | 1 + contrib/README | 3 + contrib/pacscripts | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 0 deletions(-) create mode 100755 contrib/pacscripts diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 2f131ef..3843a3f 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -5,6 +5,7 @@ EXTRA_DIST = \ gensync \ pacdiff \ paclist \ + pacscripts \ pacsearch \ pactree \ updatesync \ diff --git a/contrib/README b/contrib/README index 29962b4..0d2153b 100644 --- a/contrib/README +++ b/contrib/README @@ -16,6 +16,9 @@ paclist - list all packages installed from a given repository. Useful for seeing which packages you may have installed from the testing repository, for instance. +pacscripts - tries to print out the {pre,post}_{install,remove,upgrade} +scripts of a given package. + pacsearch - a colorized search combining both -Ss and -Qs output. Installed packages are easily identified with a *** and local-only packages are also listed. diff --git a/contrib/pacscripts b/contrib/pacscripts new file mode 100755 index 0000000..101fb15 --- /dev/null +++ b/contrib/pacscripts @@ -0,0 +1,132 @@ +#!/bin/bash +# +# pacscripts : tries to print out the {pre,post}_{install,remove,upgrade} +# scripts of a given package +# +# Copyright (c) 2009 Giulio "giulivo" Fidente <giulivo.navigante(a)gmail.com> +# Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +# bash options +set -o nounset +set -o errexit + +progname=$(basename $0) +progver="0.4" + +conf="/etc/pacman.conf" + +if [ ! -r "$conf" ]; then + echo "ERROR: unable to read $conf" + exit 1 +fi + +eval $(awk '/DBPath/ {print $1$2$3}' "$conf") +eval $(awk '/CacheDir/ {print $1$2$3}' "$conf") +pac_db="${DBPath:-/var/lib/pacman}/local" +pac_cache="${CacheDir:-/var/cache/pacman/pkg}" + +error() { + local mesg=$1; shift + printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 +} + +usage() { + echo "This program prints out the {pre,post}_{install,remove,upgrade} scripts" + echo "of a given package." + echo "Usage: $progname pkgname|pkgfile" + echo + echo " OPTIONS:" + echo " -h, --help Print this help message" + echo " -v, --version Print program name and version" + echo + echo "Example: $progname gconf-editor" + echo "Example: $progname gconf-editor-2.24.1-1-x86_64.pkg.tar.gz" +} + +spacman() { + if [ $EUID -eq 0 ]; then + pacman "$@" + else + if [ ! "$(type -p sudo)" ]; then + error "Cannot find the sudo binary! Is sudo installed?" + error "Otherwise try to run the program as root" + exit 1 + else + sudo pacman "$@" + fi + fi +} + +print_db() { + pkg=$(pacman -Q "$1") + pkg=${pkg/ /-} + if [ -f $pac_db/$pkg*/install ]; then + cat $pac_db/$pkg*/install + echo + return 0 + else + error "Package $1 does not include any .INSTALL script" + return 1 + fi +} + +print_pkg() { + if ! bsdtar -xOf "$1" .INSTALL 2>/dev/null; then + error "Package $1 does not include any .INSTALL script" + return 1 + fi + echo +} + +print_scriptlet() { + if [ -f "$1" ]; then + if bsdtar tf "$1" .PKGINFO &>/dev/null; then + print_pkg "$1" + return + fi + fi + if pacman -Q "$1" &>/dev/null; then + print_db "$1" + return + fi + if ! pacman -Si $1 &>/dev/null; then + error "Package $1 not found" + return 1 + fi + url=$(spacman -Sdp $1 | tail -n1) + filename=$(basename $url) + if [ ! -f "$pac_cache/$filename" ]; then + if ! spacman -Sdw --noconfirm $1 >&2; then + error "Failed to download $1" + return 1 + fi + echo >&2 + fi + print_pkg "$pac_cache/$filename" + return +} + +if [ $# -ne 1 ] ; then + usage + exit 1 +fi + +case "$1" in + --help|-h) usage; exit 0 ;; + --version|-v) echo "$progname version $progver"; exit 0 ;; + *) print_scriptlet $1 ;; +esac -- 1.6.1.3

1 0