- Pacman-dev - lists.archlinux.org

[pacman-dev] Checking for VSC/SCM tools in makepkg
by Allan McRae 09 Mar '09

09 Mar '09

Hi, Am I missing something here or should these sorts of tests cause a failure: devel_check() { ... # Also do a brief check to make sure we have the VCS tool available. ... [ $(type -p darcs) ] || return 0 ... [ $(type -p svn) ] || return 0 etc. At the moment, these tests just seem useless to me. Making this an error would require a decent change in makepkg as at the moment devel_check() is called before dependency resolution is done. In fact, I don't think I have ever managed to build an SCM package in a clean chroot and this may be the cause. If no-one points out something obvious I am missing, then I will file a bug report so this is not forgotten. Allan

2 4

[pacman-dev] Useless comments...
by Allan McRae 09 Mar '09

09 Mar '09

Hi, if (you don't want to read a semi rant) exit 0; I have noticed a number of useless comments in makepkg and have decided that they are worse than no comments. Examples: 1) This inspired the rant! download_sources # we can only check checksums if we have all files check_checksums Huh, why are we not checking for all files then? Because download_sources exits when it fails... 2) and there are a lot of these: # fix flyspray feature request #2978 # fix flyspray bug #5923 # Fixes FS#10039 # fix flyspray #6246 #fix flyspray feature request #5223 # fix flyspray bug #5973 and I am guilty here... but I was at the airport with no internet access so I had no idea if these are important. And most of these appeared to be non-obscure features/fixes so did not need a comment justifying their inclusion. 3) overly obvious comments # do we have a changelog? if [ -f "$startdir/ChangeLog" ]; then If you do not understand that test, then leave the code alone... I will patch these out eventually but I like to share my frustration. I am just a generous guy! Allan

4 3

[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

[pacman-dev] [PATCH 1/5] Fix several issues with xdelta
by Xavier Chantry 01 Mar '09

01 Mar '09

1) The changes to sync.c look big but there are mostly caused by the indentation. Fix a bug where download_size == 0 because the packages and deltas are already in the cache, but we still need to build the deltas list and apply the deltas to create the final package. 2) Fix the gzip / md5sum issue by switching to xdelta3, disabling external recompression and using gzip -n in pacman, and disable bsdtar compression and using gzip -n in makepkg. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- doc/pacman.conf.5.txt | 2 +- lib/libalpm/delta.c | 4 +- lib/libalpm/sync.c | 98 +++++++++++++++++++++++-------------------------- scripts/makepkg.sh.in | 28 +++----------- 4 files changed, 55 insertions(+), 77 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index fa21294..2f1fe3d 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -144,7 +144,7 @@ Options *UseDelta*:: Download delta files instead of complete packages if possible. Requires - the xdelta program to be installed. + the xdelta3 program to be installed. *TotalDownload*:: When downloading, display the amount downloaded, download rate, ETA, diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index ff77501..337eb66 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -232,13 +232,13 @@ off_t _alpm_shortest_delta_path(alpm_list_t *deltas, return(bestsize); } - _alpm_log(PM_LOG_DEBUG, "started delta shortest-path search\n"); + _alpm_log(PM_LOG_DEBUG, "started delta shortest-path search for '%s'\n", to); vertices = delta_graph_init(deltas); bestsize = delta_vert(vertices, to, to_md5, &bestpath); - _alpm_log(PM_LOG_DEBUG, "delta shortest-path search complete\n"); + _alpm_log(PM_LOG_DEBUG, "delta shortest-path search complete : '%lld'\n", (long long)bestsize); alpm_list_free_inner(vertices, _alpm_graph_free); alpm_list_free(vertices); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 709a36d..71d8771 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -725,14 +725,9 @@ static int apply_deltas(pmtrans_t *trans) CALLOC(to, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, 1)); snprintf(to, len, "%s/%s", cachedir, d->to); - /* an example of the patch command: (using /cache for cachedir) - * xdelta patch /path/to/pacman_3.0.0-1_to_3.0.1-1-i686.delta \ - * /path/to/pacman-3.0.0-1-i686.pkg.tar.gz \ - * /cache/pacman-3.0.1-1-i686.pkg.tar.gz - */ - /* build the patch command */ - snprintf(command, PATH_MAX, "xdelta patch %s %s %s", delta, from, to); + /* -R for disabling external recompression with gzip, -c for sending to stdout */ + snprintf(command, PATH_MAX, "xdelta3 -d -q -R -c -s %s %s | gzip -n > %s", from, delta, to); _alpm_log(PM_LOG_DEBUG, _("command: %s\n"), command); @@ -848,29 +843,31 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) fname = alpm_pkg_get_filename(spkg); ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1)); - if(spkg->download_size != 0) { - alpm_list_t *delta_path = spkg->delta_path; - if(delta_path) { - alpm_list_t *dlts = NULL; - - for(dlts = delta_path; dlts; dlts = dlts->next) { - pmdelta_t *d = dlts->data; - - if(d->download_size != 0) { - /* add the delta filename to the download list if - * it's not in the cache */ - files = alpm_list_add(files, strdup(d->delta)); - } - - /* keep a list of the delta files for md5sums */ - deltas = alpm_list_add(deltas, d); + alpm_list_t *delta_path = spkg->delta_path; + if(delta_path) { + /* using deltas */ + alpm_list_t *dlts = NULL; + + for(dlts = delta_path; dlts; dlts = dlts->next) { + pmdelta_t *d = dlts->data; + + if(d->download_size != 0) { + /* add the delta filename to the download list if needed */ + files = alpm_list_add(files, strdup(d->delta)); } - } else { - /* not using deltas, so add the file to the download list */ + /* keep a list of all the delta files for md5sums */ + deltas = alpm_list_add(deltas, d); + } + + } else { + /* not using deltas */ + if(spkg->download_size != 0) { + /* add the filename to the download list if needed */ files = alpm_list_add(files, strdup(fname)); } } + } } @@ -891,37 +888,34 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) handle->totaldlcb(0); } - if(handle->usedelta) { + /* if we have deltas to work with */ + if(handle->usedelta && deltas) { int ret = 0; - - /* only output if there are deltas to work with */ - if(deltas) { - errors = 0; - /* Check integrity of deltas */ - EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_START, NULL, NULL); - - for(i = deltas; i; i = i->next) { - pmdelta_t *d = alpm_list_getdata(i); - const char *filename = alpm_delta_get_filename(d); - const char *md5sum = alpm_delta_get_md5sum(d); - - if(test_md5sum(trans, filename, md5sum) != 0) { - errors++; - *data = alpm_list_add(*data, strdup(filename)); - } - } - if(errors) { - pm_errno = PM_ERR_DLT_INVALID; - goto error; + errors = 0; + /* Check integrity of deltas */ + EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_START, NULL, NULL); + + for(i = deltas; i; i = i->next) { + pmdelta_t *d = alpm_list_getdata(i); + const char *filename = alpm_delta_get_filename(d); + const char *md5sum = alpm_delta_get_md5sum(d); + + if(test_md5sum(trans, filename, md5sum) != 0) { + errors++; + *data = alpm_list_add(*data, strdup(filename)); } - EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_DONE, NULL, NULL); + } + if(errors) { + pm_errno = PM_ERR_DLT_INVALID; + goto error; + } + EVENT(trans, PM_TRANS_EVT_DELTA_INTEGRITY_DONE, NULL, NULL); - /* Use the deltas to generate the packages */ - EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_START, NULL, NULL); - ret = apply_deltas(trans); - EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_DONE, NULL, NULL); + /* Use the deltas to generate the packages */ + EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_START, NULL, NULL); + ret = apply_deltas(trans); + EVENT(trans, PM_TRANS_EVT_DELTA_PATCHES_DONE, NULL, NULL); - } if(ret) { pm_errno = PM_ERR_DLT_PATCHFAILED; goto error; diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 52e80d1..9e0f249 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -975,7 +975,7 @@ create_package() { # the null string rather than itself shopt -s nullglob - if ! bsdtar -c${TAR_OPT}f "$pkg_file" $comp_files *; then + if ! bsdtar -c${TAR_OPT}f - $comp_files * | gzip -n > "$pkg_file"; then error "$(gettext "Failed to create package file.")" exit 1 # TODO: error code fi @@ -985,8 +985,8 @@ create_package() { create_xdelta() { if [ "$(check_buildenv xdelta)" != "y" ]; then return - elif [ ! "$(type -p xdelta)" ]; then - error "$(gettext "Cannot find the xdelta binary! Is xdelta installed?")" + elif [ ! "$(type -p xdelta3)" ]; then + error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" return fi @@ -1020,25 +1020,9 @@ create_xdelta() { local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$CARCH.delta" local ret=0 - # xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if - # TMP_DIR is unset) then perform the delta on the resulting tars - xdelta delta "$base_file" "$pkg_file" "$delta_file" || ret=$? - - if [ $ret -eq 0 -o $ret -eq 1 ]; then - # Generate the final gz using xdelta for compression. xdelta will be our - # common denominator compression utility between the packager and the - # users. makepkg and pacman must use the same compression algorithm or - # the delta generated package may not match, producing md5 checksum - # errors. - msg2 "$(gettext "Recreating package tarball from delta to match md5 signatures")" - msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")" - ret=0 - xdelta patch "$delta_file" "$base_file" "$pkg_file" || ret=$? - if [ $ret -ne 0 ]; then - error "$(gettext "Could not generate the package from the delta.")" - exit 1 - fi - else + xdelta3 -s "$base_file" "$pkg_file" "$delta_file" || ret=$? + + if [ $ret -ne 0 ]; then warning "$(gettext "Delta was not able to be created.")" fi else -- 1.6.1.3

5 20

[pacman-dev] [PATCH 1/6] repo-add: print warning if same version already exists
by Xavier Chantry 01 Mar '09

01 Mar '09

Simple fix for FS#13414 Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/repo-add.sh.in | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c6d25aa..b12188c 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -172,12 +172,16 @@ db_write_entry() return 1 fi - # remove an existing entry if it exists, ignore failures - db_remove_entry "$pkgname" - startdir=$(pwd) pushd "$gstmpdir" 2>&1 >/dev/null + if [ -d "$pkgname-$pkgver" ]; then + warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" + fi + + # remove an existing entry if it exists, ignore failures + db_remove_entry "$pkgname" + # create package directory mkdir "$pkgname-$pkgver" cd "$pkgname-$pkgver" -- 1.6.1.3

4 13

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.2-10-gb3c67a1
by dan＠archlinux.org 28 Feb '09

28 Feb '09

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, maint has been updated via b3c67a195f254fe456003559ceac0ae0771d93e6 (commit) from a309a016bfed9f67452f2a6556fb4391fd55b34e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/kk.po | 557 +++++++++++++++++ po/LINGUAS | 1 + po/kk.po | 1575 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 2134 insertions(+), 0 deletions(-) create mode 100644 lib/libalpm/po/kk.po create mode 100644 po/kk.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-99-gd8d9ab8
by dan＠archlinux.org 28 Feb '09

28 Feb '09

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 d8d9ab8c870eb9f2df5e6e607b1da34e6e40e29e (commit) via 4458f71851e6056957e6fafebec286765bbbcc39 (commit) via b4e1365657f477f4e27933ccc3d408b7e19ac6da (commit) via 8c09c19139b47dab3bf2282f87fe289e1282f361 (commit) via f09f82ee595319917c794dff69486bca851a5601 (commit) via b3c67a195f254fe456003559ceac0ae0771d93e6 (commit) from 2268981ebf562a7dda1e788dbd931e48adf9fabb (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 d8d9ab8c870eb9f2df5e6e607b1da34e6e40e29e Author: Dan McGee <dan(a)archlinux.org> Date: Sat Feb 28 15:46:51 2009 -0600 Update checks for python in configure Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4458f71851e6056957e6fafebec286765bbbcc39 Merge: b4e1365657f477f4e27933ccc3d408b7e19ac6da b3c67a195f254fe456003559ceac0ae0771d93e6 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Feb 28 15:43:36 2009 -0600 Merge branch 'maint' commit b4e1365657f477f4e27933ccc3d408b7e19ac6da Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Feb 25 19:40:57 2009 +0100 makepkg : remove xdelta support The pkgdelta script can be used instead. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8c09c19139b47dab3bf2282f87fe289e1282f361 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Feb 25 18:24:38 2009 +0100 libalpm: remove from_md5 and to_md5 from pmdelta_t The from_md5 and to_md5 fields were a nice extra safety, which would avoid trying to apply deltas on corrupted package files. However, they are not strictly necessary, since xdelta should be able to detect that on its own. The main problem is that it is impossible to compute these informations from the delta only. So repo-add would not be able to compute the delta entry based on just the delta file. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f09f82ee595319917c794dff69486bca851a5601 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 26 18:00:15 2009 +0100 repo-add: print warning if same version already exists Simple fix for FS#13414. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- doc/makepkg.conf.5.txt | 7 +- etc/makepkg.conf.in | 5 +- lib/libalpm/alpm.h | 2 - lib/libalpm/delta.c | 57 +-- lib/libalpm/delta.h | 14 +- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/kk.po | 557 +++++++++++++++++ lib/libalpm/sync.c | 1 - po/LINGUAS | 1 + po/kk.po | 1575 ++++++++++++++++++++++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 66 -- scripts/repo-add.sh.in | 10 +- 13 files changed, 2165 insertions(+), 133 deletions(-) create mode 100644 lib/libalpm/po/kk.po create mode 100644 po/kk.po hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 11/11] repo-add : fix package variables declaration
by Xavier Chantry 27 Feb '09

27 Feb '09

- arch was missing - backup is not used by repo-add. However makepkg still needs to put it in PKGINFO because pacman uses it - startdir is no longer used after the new delta implementation - the declaration of group, depend, backup, etc is not needed because these variables are always declared before being used : declare $var="$val" case "$var" in group) _groups="$_groups$group\n" ;; - reorder the variables declaration to follow the same order than they are written to the depends and desc file, for making future checks easier Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/repo-add.sh.in | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 504adfd..4097a11 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -180,10 +180,8 @@ db_write_entry() { # blank out all variables local pkgfile="$1" - local pkgname pkgver pkgdesc url builddate packager csize size \ - group depend backup license replaces provides conflict force \ - _groups _depends _backups _licenses _replaces _provides _conflicts \ - startdir optdepend _optdepends md5sum + local pkgname pkgver pkgdesc csize size md5sum url arch builddate packager force \ + _groups _licenses _replaces _depends _conflicts _provides _optdepends local OLDIFS="$IFS" # IFS (field separator) is only the newline character @@ -200,12 +198,11 @@ db_write_entry() declare $var="$val" case "$var" in group) _groups="$_groups$group\n" ;; - depend) _depends="$_depends$depend\n" ;; - backup) _backups="$_backups$backup\n" ;; license) _licenses="$_licenses$license\n" ;; replaces) _replaces="$_replaces$replaces\n" ;; - provides) _provides="$_provides$provides\n" ;; + depend) _depends="$_depends$depend\n" ;; conflict) _conflicts="$_conflicts$conflict\n" ;; + provides) _provides="$_provides$provides\n" ;; optdepend) _optdepends="$_optdepends$optdepend\n" ;; esac done @@ -222,7 +219,6 @@ db_write_entry() return 1 fi - startdir=$(pwd) pushd "$gstmpdir" 2>&1 >/dev/null if [ -d "$pkgname-$pkgver" ]; then -- 1.6.1.3

1 0

[pacman-dev] repo-add sanity check
by Allan McRae 27 Feb '09

27 Feb '09

Hi, I took repo-add from the pacman package and one built from the latest git will all Xavier's patches and made a repo db from all packages in my cache (all of testing, core and extra, some community). There are a few differences (see http://dev.archlinux.org/~allan/repoadd-diff.txt) A summary of the differences: A bunch of packages have the ARCH field removed: -%ARCH% -i686 A few differences to do with quotes. e.g. -custom:INTEL537 +custom:"INTEL537" and +%DESC% +Efficient bit vector, set of integers and "big int" math library This change is not so good... (k3b-i18n package) %DEPENDS% -k3b>=1.0.5-1 +k3b>=$pkgver Allan

3 5

[pacman-dev] Disk Space
by Matthew Wood 26 Feb '09

26 Feb '09

I'm a little new to package management coding, so forgive my stupid question, but I'm wondering if there is a way to get the current package size. For example, like Aarons example, if foobar-1.0 is installed, and we got the size of foobar then we should have a reasonable size estimate of foobar-1.1. If we took that estimate, multiply by 10% and compare that number to the disk space remaining, would that catch 99% of the errors? If there isn't a current mechanism we could have a function that adds the total size of all the installed apps files and return that to the upgrade function. What about that coupled with a prompt if disk space seems low, say below 100-200 mb? I'd be willing to help with whatever patches are necessary for this.

2 1

[pacman-dev] Dan's and Xavier's git home
by Xavier 26 Feb '09

26 Feb '09

On Thu, Feb 26, 2009 at 10:25 AM, Allan McRae <allan(a)archlinux.org> wrote: > > OK. I will pull your patches into a git branch to remind myself to go > through these in a lot of detail sometime in the next week or so. Do you > have a git home now that Dan moved his server or do I need to apply them > from the mailing list? shining.toofishes.net does not seem to exist > anymore. > My repo has moved to Dan's new server, and they can now all be found on the same page, with a cgit interface : http://code.toofishes.net/cgit/ Thanks Dan :)

2 2

[pacman-dev] Disk Space
by Matthew Wood 24 Feb '09

24 Feb '09

What if we checked for disk space on all volumes, prior to the processing of the users command. If the function detects that disk space is lower than a certain amount, say 100 mb, to at least warn the user? This would of course be a temporary solution, for a more permanent possibility we could implement two functions that work in conjunction with each other. The first function would check the downloads to ensure they completed successfully, if they did then it would pass the work to a second function that checks the extracted package size against all mounted volumes, or at least the size of the volumes of the major installation location (/usr, /etc, /var, etc) Does this make any sense or am I barking up the wrong tree? Matt

5 5

[pacman-dev] Possible bug in pacman
by Matías De la Puente 24 Feb '09

24 Feb '09

hi all! i wanted to ignore a pkg in a group but i can with this: pacman -S gnome-extra --ignore orca Pacman after i say yes to install all the packages but then ask me if i want to install orcad that's insidce ignorePkg/ignoreGroup, i say no but then pacman exit saying that it can't found orca pkg or group Thanks matias

2 1

[pacman-dev] [PATCH 1/2] Enabled new interactive prompt and updated some tests.
by Bryan Ischo 24 Feb '09

24 Feb '09

From: Bryan Ischo <bryan(a)ischo.com> Enabled a new prompt to ask the user if they'd like to remove unresolvable packages from the transaction rather than failing it. Many pactest tests that used to fail not return success codes, because pacman now issues a prompt allowing the user to cancel rather than failing many transactions, and the pactest scripts always choose to cancel with no error rather than failing. The only net effect is that the return status of pacman is now 0 in cases where it used to be nonzero. Signed-off-by: Bryan Ischo <bryan(a)ischo.com> --- lib/libalpm/alpm.h | 3 ++- lib/libalpm/deps.c | 6 +++--- lib/libalpm/sync.c | 23 ++++++++++++++++++----- pactest/tests/provision020.py | 2 +- pactest/tests/provision022.py | 2 +- pactest/tests/sync1008.py | 2 +- pactest/tests/sync300.py | 2 +- src/pacman/callback.c | 16 ++++++++++++++++ 8 files changed, 43 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 7b7ca4e..3836d60 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -371,7 +371,8 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_REPLACE_PKG = 0x02, PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, - PM_TRANS_CONV_LOCAL_NEWER = 0x10 + PM_TRANS_CONV_LOCAL_NEWER = 0x10, + PM_TRANS_CONV_REMOVE_PKGS = 0x20, } pmtransconv_t; /* Transaction Progress */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 41d2a83..ebcd18d 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -531,8 +531,8 @@ pmpkg_t *_alpm_resolvedep(pmdepend_t *dep, alpm_list_t *dbs, alpm_list_t *exclud !_alpm_pkg_find(excluding, pkg->name)) { if(_alpm_pkg_should_ignore(pkg)) { int install; - QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, pkg, - tpkg, NULL, &install); + QUESTION(handle->trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, + pkg, tpkg, NULL, &install); if(!install) { continue; } @@ -609,7 +609,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, if(!spkg) { pm_errno = PM_ERR_UNSATISFIED_DEPS; char *missdepstring = alpm_dep_compute_string(missdep); - _alpm_log(PM_LOG_ERROR, _("cannot resolve \"%s\", a dependency of \"%s\"\n"), + _alpm_log(PM_LOG_WARNING, _("cannot resolve \"%s\", a dependency of \"%s\"\n"), missdepstring, tpkg->name); free(missdepstring); if(data) { diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 5e5ca92..ea903f4 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -442,12 +442,25 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync dependencies not already on the list */ } - /* If there were unresolvable top-level packages, fail the - transaction. */ + /* 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) { - /* pm_errno is set by resolvedeps */ - ret = -1; - goto cleanup; + int remove_unresolvable = 0; + QUESTION(handle->trans, PM_TRANS_CONV_REMOVE_PKGS, unresolvable, NULL, NULL, &remove_unresolvable); + if (remove_unresolvable) { + /* User wants to remove the unresolvable packages from the + transaction, so simply drop the unresolvable list. The + packages will be removed from the actual transaction when + the transaction packages are replaced with a + dependency-reordered list below */ + alpm_list_free(unresolvable); + unresolvable = NULL; + } + else { + /* pm_errno is set by resolvedeps */ + ret = -1; + goto cleanup; + } } /* Add all packages which were "pulled" (i.e. weren't already in the diff --git a/pactest/tests/provision020.py b/pactest/tests/provision020.py index 7cb0a01..c9c0ac3 100644 --- a/pactest/tests/provision020.py +++ b/pactest/tests/provision020.py @@ -10,6 +10,6 @@ self.args = "-S %s" % p.name -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/provision022.py b/pactest/tests/provision022.py index 4883d42..190a8b6 100644 --- a/pactest/tests/provision022.py +++ b/pactest/tests/provision022.py @@ -10,6 +10,6 @@ self.args = "-S %s" % p.name -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/sync1008.py b/pactest/tests/sync1008.py index a606459..90c61df 100644 --- a/pactest/tests/sync1008.py +++ b/pactest/tests/sync1008.py @@ -14,6 +14,6 @@ self.args = "-S pkg" -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg") self.addrule("!PKG_EXIST=cpkg") diff --git a/pactest/tests/sync300.py b/pactest/tests/sync300.py index 31b520a..36d6758 100644 --- a/pactest/tests/sync300.py +++ b/pactest/tests/sync300.py @@ -9,6 +9,6 @@ self.args = "-S %s" % sp1.name -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 6e7930c..d6b5b01 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -270,6 +270,22 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, (char *)data2, (char *)data2); break; + case PM_TRANS_CONV_REMOVE_PKGS: + { + alpm_list_t *unresolved = (alpm_list_t *) data1; + alpm_list_t *namelist = NULL, *i; + for (i = unresolved; i; i = i->next) { + namelist = alpm_list_add(namelist, + (char *) alpm_pkg_get_name(i->data)); + } + printf(":: the following package(s) cannot be upgraded due to " + "unresolvable dependencies:\n"); + list_display(" ", namelist); + *response = yesno(_("\nDo you want to skip the above " + "package(s) for this upgrade?")); + alpm_list_free(namelist); + } + break; case PM_TRANS_CONV_LOCAL_NEWER: if(!config->op_s_downloadonly) { *response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"), -- 1.6.1

7 45

Re: [pacman-dev] Git's views versus parallel branches (was Re: [PATCH 1/2] Enabled ...)
by Sebastian Nowicki 24 Feb '09

24 Feb '09

On 24/02/2009, at 1:45 PM, Bryan Ischo wrote: > An analogy: using git is kind of like keeping every directory in > your home directory in a separate tar file, except for one untarred > working directory. Whenever you want to cd into a new directory, > you have to tar up the directory you were just in, and then untar > the directory you want to cd into. Although I understand what you're getting at, the analogy is an exaggeration. The workflow you described requires archiving the directory, storing the archive somewhere, then removing the directory, and un-archiving a different archive, then changing to that directory. This is in contrast with a simple "git checkout branch" (possibly with a prior commit, or stash, operation). I.e., five operations as opposed to one or two. > An example of what I can do with parallel branches: if my branch > 'new' and 'old' were stored in two separate subdirectories, then I > could grep through all of the files in both branches with one > command and see collated results; or could diff only files in which > a given identifier appeared only in a file on one branch but not the > corresponding file on another. Given git's flexibility and UNIX philosophy, I'm sure it would be possible to create tools which did this. Most of my development thus far has been either adding features, or modifying small things, so I haven't had a need for this. In general the changes where not conflicting between branches, and I did not need to compare my branches with an upstream master branch. Perhaps this is a workflow issue (doing too many things at once)? > Another problem with git: I have to constantly rebuild stuff when I > stash and unstash because my build directory doesn't stash. I don't see why anyone would want to frequently change directories and compile. When I switch to a branch I tend to work on it for a while before switching to another one. > I'd rather use a paradigm that thousands of tools already depend on, > than the special case paradigm that is git. I don't see how this would improve your workflow in any way whatsoever, but it is possible to simply keep multiple trees, with a specific branch checked out. For instance instead of having one git repository "foobar", you could have a project directory "foobar", and have two repositories "eggs" and "spam", cloned from the same "master" repository, but with the "eggs" and "spam" branches checked out, respectively. You could still do all the other operations with git, if you add the other repositories as remotes, but this adds unnecessary maintenance. I see Dan beat me to pointing this out already. > If anything, git seems messier to me because some files get changed > in-place as you switch branches in git, and some files are ignored > and left as they are (those that aren't actually tracked by git), > and distinguishing between the two types requires git commands and > lots of mental notes. As I mentioned in my previous post, the files simply shouldn't be ignored, they should be added to a temporary commit before switching, otherwise you get confused. This is the downside of switching branches in-place. I don't really have a preference between a directory-based branch structure or an in-place structure. However, git's branches let you have a single tree (working directory), which seems simpler and cleaner. > you can do a grep over multiple branches at once to find identifiers git grep (not sure if it can actually grep over multiple branches) > , you can count line numbers for entire branches if you like to see > how much bigger your code base is in one branch than another git diff my_branch..other_branch --stat > you have to run many git commands Not really. Git is highly scriptable, if you do something often, you can script the git commands to do it (if they don't already exist), and just run the script. This is also what you'd call the UNIX philosophy. > git seems to require keeping a mental model of branches that you > can't even "see" because they aren't in your filesystem anywhere. Indeed, git doesn't track files, it tracks file content. Branches are just labels for a sequence of changes. I'm sure this gives git many advantages over other SCMs, but I'm not familiar enough with the underlying implementation to give any insight. > Except that not only am I getting confused about the state of my > branches as I commit partially complete changes to them for the > purpose of saving state as I switch between branches, the tools that > I use are getting confused as well. This seems to be a consistent theme in your workflow - "I switch branches frequently". This is probably why you're having so much trouble with git, and I suggest you ask yourself _why_ you switch branches so frequently. It seems to me like you're treating branches more like commits - each branch is a single logical change to the tree. Even though branches are cheap, I still only have a few around, and rarely switch between them. They are there to separate related commits, and to provide isolation from other branches. It may be that you're a "hacker" and simply work on unrelated code arbitrarily. I do that a lot too, but I somehow don't have the same problems you're facing. > Do some google searches. File renaming in version control systems > is a big deal, and for good reason. Like this? ;) http://article.gmane.org/gmane.comp.version-control.git/217 > Yes; it's called refactoring. On a well managed project it doesn't > happen often, but it does happen. Reorganization of subtrees of > code is something that source control systems should support well. > It's the merging after such reorganization that tools that don't > track renames have problems with. For examples of git failing in > this, take a look at the simple scripts I sent out to the list > earlier today. I don't see how renames are relevant in this situation. In fact, rename information would probably cause more problems. When you refactor, you're moving content, not files. Typically you also change that content significantly. I don't see why git would have any problem with this - this is actually where git's content tracking shines. > Git doesn't allow you to rename and change contents of a file at the > same time: > > [snip] > > If I 'git commit' it will take the rename of file to file2, but not > the modification of file2. If I try to add file2 before committing, > git status now shows: > > [snip] > > If you check this in, git will not be able to merge changes to file2 > into a branch taken before this change. I just tried a a more complex example that I was sure would result in a merge conflict. I basically created "file" and committed. I created the "move" branch I moved "file" to "file2", and edited it. At this point, `git status` showed something different to your output: $ git mv file file2 $ vi file2 $ git add file2 $ git status # On branch move # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # renamed: file -> file2 # $ git commit -m "changed file and renamed as file2" [move]: created 1fe9963: "changed file and renamed as file2" 1 files changed, 6 insertions(+), 8 deletions(-) rename file => file2 (58%) I commited the change, and created a branch "change" from master. I edited the same parts of the file and commited. Now I merged branch "move" into this branch. Naturally I get a conflict: $ git merge move Renaming file => file2 Auto-merging file2 CONFLICT (rename/modify): Merge conflict in file2 Automatic merge failed; fix conflicts and then commit the result. bash-3.2$ git status file2: needs merge # On branch changes # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # deleted: file # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # unmerged: file2 # Even when the file was moved, and a significant amount of it was changed (42%), git managed to see that it was moved, and still merged "file2" from the "move" branch with "file" from the "change" branch. The conflict would have occurred regardless of the move operation. Perhaps in a less contrived example the result would be different, but it would be an edge case where the renamed file's content really doesn't resemble that of the original file. > My impression of git is that it feels very much like what its > history suggests that it is: a tool for managing patches that grew > into a source control system. For better or worse, git feels > 'messy' to me, like it wasn't thought out ahead of time but kind of > organically grew I'm sure it was planned out quite well. Linus knew what he hated about other SCMs, he had some good ideas about how to improve those areas, and he did. Git does everything very well so far, and it's faster than any SCM I know about. > Git has dozens of commands, each with dozens of subtle and tricky > options; that seems like needless complexity to me. Git was made by a developer for developers. Of course the interface won't be nice and shiny. The difference between Git's interface and other SCMs' interfaces is that Git has it's guts exposed. Fortunately there is nice porcelain now. I suggest that you discuss these problems with the people at #git. They seem friendly and they know a _lot_ about git. I'm sure they could either explain how to use git to accommodate your workflow, or perhaps expose "flaws" in your workflow. At the very least you will know if git is for you or not. Sorry for going so off-topic here. This isn't even about pacman anymore :P.

2 1

Re: [pacman-dev] pacman and libalpm translation to kazakh
by Dan McGee 24 Feb '09

24 Feb '09

On Thu, Feb 19, 2009 at 11:11 AM, Baurzhan Muftakhidinov <baurthefirst(a)gmail.com> wrote: > Hi all, this is the latest (final) versions of translation. > > Hugo, I'm sorry, I've send the files to other e-mail, not this > (hugodoria(a)gmail.com) > > > Thanks all for great distro;) Thanks- I've patched this locally and I will push it in the next day or two to the main repository. -Dan

1 0