- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Cleanup to Arch-specific pacman.conf
by Travis Willard 13 Jan '08

13 Jan '08

This patch cleans up the Arch-specific pacman.conf (to be provided in the pacman Archlinux package) in an attempt to reduce the number of PEBKAC errors seen enabling default-disabled repos. Not a git patch, but a straight diff -u, since the Arch-specific file won't anymore be in the git repo, and I figured a patch against the generated pacman.conf'd be better than a patch against pacman.conf.in. If I'm mistaken, I'll patch the version in the projects.archlinux.org git repo (master branch) and submit that patch instead. Let me know. Signed-off-by: Travis Willard <travis(a)archlinux.org>

3 2

[pacman-dev] Czech translation update
by Vojtěch Gondžala 13 Jan '08

13 Jan '08

Hi all, this is the last update for this moment, I hope :) vogo

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.0-27-g521de7c
by Dan McGee 13 Jan '08

13 Jan '08

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 521de7ceedc6e4f5df52c0380f536a6f13a7f578 (commit) via bbe02ec57fd56670dfe0bc08d981ce8a1aa31370 (commit) via 47e8dd0670f14ae2a1efe25fc920d1d46cdec586 (commit) via 78e7342c1625f9cba399b89ab58a20599ae12c5a (commit) via ab506f77c04a481782d9e53c6a285227f58f5cf7 (commit) via 3de21473768c1801833a10a1872ce7612e8edb59 (commit) via 4f267017936471c8248a85f8d86aabb96e66c7e8 (commit) via 435ec29bc75fc9efd81472ce2f53d081f8be14b8 (commit) via 633dbeac88316f71f0f5642b4b8b00cc6d262919 (commit) via e654236db6b01d21cff7c850efedff183dd86b61 (commit) via 26f4993e1d67a7daae1dcac47e112f9b15a6bf97 (commit) from 2630556bdef7a07fda056fdcd0a2fa00c3625d3c (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 521de7ceedc6e4f5df52c0380f536a6f13a7f578 Merge: 4f267017936471c8248a85f8d86aabb96e66c7e8 bbe02ec57fd56670dfe0bc08d981ce8a1aa31370 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 13 12:27:17 2008 -0600 Merge branch 'maint' commit 4f267017936471c8248a85f8d86aabb96e66c7e8 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 12 20:18:20 2008 -0600 memleak fix with new dynamic depend structure Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 435ec29bc75fc9efd81472ce2f53d081f8be14b8 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Jan 12 21:27:13 2008 +0100 libalpm/sync.c: don't duplicate packages for the sync->data field. Packages put in the sync->data field were always duplicated with pkg_dup, and then freed, This is not needed. Killing this duplication of packages made the memory usage during base reinstall go from 10.4 MB to 8.1 MB. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 26f4993e1d67a7daae1dcac47e112f9b15a6bf97 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Wed Jan 9 18:24:11 2008 -0600 Store replaces in the local DB too Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> [Dan: might as well store 'force' too] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/zsh_completion | 20 +++++--------------- doc/PKGBUILD.5.txt | 2 +- lib/libalpm/be_files.c | 37 +++++++++---------------------------- lib/libalpm/conflict.c | 2 +- lib/libalpm/deps.c | 20 ++++++++++++-------- lib/libalpm/remove.c | 4 +++- lib/libalpm/sync.c | 42 +++++++----------------------------------- lib/libalpm/util.c | 2 -- scripts/gensync.sh.in | 6 +++--- scripts/updatesync.sh.in | 4 ++-- src/pacman/callback.c | 18 +++++++++++++----- 11 files changed, 56 insertions(+), 101 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.0-19-gbbe02ec
by Dan McGee 13 Jan '08

13 Jan '08

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 bbe02ec57fd56670dfe0bc08d981ce8a1aa31370 (commit) via 47e8dd0670f14ae2a1efe25fc920d1d46cdec586 (commit) via 78e7342c1625f9cba399b89ab58a20599ae12c5a (commit) via ab506f77c04a481782d9e53c6a285227f58f5cf7 (commit) via 3de21473768c1801833a10a1872ce7612e8edb59 (commit) via 633dbeac88316f71f0f5642b4b8b00cc6d262919 (commit) via e654236db6b01d21cff7c850efedff183dd86b61 (commit) from 8ffa6fa7adf291b3dad822c459e1372a31af09f1 (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: contrib/zsh_completion | 20 +++++--------------- doc/PKGBUILD.5.txt | 2 +- lib/libalpm/deps.c | 20 ++++++++++++-------- lib/libalpm/remove.c | 4 +++- lib/libalpm/util.c | 2 -- scripts/gensync.sh.in | 6 +++--- scripts/updatesync.sh.in | 4 ++-- src/pacman/callback.c | 18 +++++++++++++----- 8 files changed, 39 insertions(+), 37 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Update Gensync and Updatesync to use new PKGEXT variable, which includes leading period.
by Travis Willard 13 Jan '08

13 Jan '08

Previously, this caused both scripts to look for pkgname-pkgver-pkgrel-arch..pkg.tar.gz - extra period has been removed Fixes FS9190 Signed-off-by: Travis Willard <travis(a)archlinux.org> --- scripts/gensync.sh.in | 6 +++--- scripts/updatesync.sh.in | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/gensync.sh.in b/scripts/gensync.sh.in index b49c26e..04f8002 100644 --- a/scripts/gensync.sh.in +++ b/scripts/gensync.sh.in @@ -130,13 +130,13 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do CARCH='any' fi if [ "$pkgdir" != "" ]; then - pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" + pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}" else - pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" + pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}" fi if [ ! -f "$pkgfile" ]; then - error "$(gettext "could not find %s-%s-%s-%s.%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT + error "$(gettext "could not find %s-%s-%s-%s%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT else if check_force; then forcepkgs="$forcepkgs $pkgfile" diff --git a/scripts/updatesync.sh.in b/scripts/updatesync.sh.in index 2e47ac9..900f11f 100644 --- a/scripts/updatesync.sh.in +++ b/scripts/updatesync.sh.in @@ -127,10 +127,10 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE if [ "$arch" = 'any' ]; then CARCH='any' fi - pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" + pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}" if [ ! -f "$pkgfile" ]; then - die "$(gettext "could not find %s-%s-%s-%s.%s - aborting")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT + die "$(gettext "could not find %s-%s-%s-%s%s - aborting")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT fi if check_force; then -- 1.5.3.7

2 1

[pacman-dev] pacman crash
by Allan McRae 13 Jan '08

13 Jan '08

Just so someone here sees this forum post: http://bbs.archlinux.org/viewtopic.php?id=42214 Show pacman crashing with message: Proceed with installation? [Y/n] y *** glibc detected *** pacman: double free or corruption (out): 0x08908520 ***

2 2

[pacman-dev] 3.1.0 polish translation
by Mateusz Jedrasik 13 Jan '08

13 Jan '08

Just wanted to drop a line saying I've started work on the polish translation of 3.1, so that if anybody plans to do it as well, contact me please first so we won't be doing duplicate work. So far I'm at ~50% of pacman's .po file. Have not started with libalpm yet. A lot of new lines, and old ones needed fixing. I'm on it. Cheers, //m. -- Mateusz Jędrasik <m.jedrasik(a)gmail.com> tel. +48(79)022-9393, +48(51)69-444-90 http://imachine.szklo.eu.org

2 1

[pacman-dev] [pacman 3.1] wrong permission of files and rep in package
by solsTiCe d'Hiver 12 Jan '08

12 Jan '08

hi. i am using pacman 3.1 for x86_64. and the package i create with makepkg have wrong permissions: directory have permission drw------- and files have -rw------- it's because i use umask=0077 for my user. and because, i suppose, of that new "feature", only runs in fakeroot when necessary i see in the ChangeLog of pacman 3.1 well it seems, that by willing to run in fakeroot only when needed you did not use fakeroot when you should or the bug i am reporting is a feature ? it will break many PKGBUILD for people using umask=0077 at least pacman warns you when you install such a package

2 4

[pacman-dev] [PATCH] New --asexplicit option
by Nagy Gabor 12 Jan '08

12 Jan '08

From 99a8136cb82d75795a3224baf09ab5ca728e6bd9 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 12 Jan 2008 17:08:03 +0100 Subject: [PATCH] New --asexplicit option This is the brother of --asdeps, install packages explicitly. Documentation and completion files were updated accordingly. Added sync301.py and upgrade032.py pactest files to test this. I also made a little modification in ALLDEPS handling too. A typo was also fixed in the manual. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- contrib/bash_completion | 2 ++ contrib/zsh_completion | 1 + doc/pacman.8.txt | 7 ++++++- lib/libalpm/add.c | 17 ++++++++--------- lib/libalpm/alpm.h | 3 ++- pactest/tests/sync031.py | 19 +++++++++++++++++++ pactest/tests/upgrade032.py | 19 +++++++++++++++++++ src/pacman/pacman.c | 7 +++++++ 8 files changed, 64 insertions(+), 11 deletions(-) create mode 100644 pactest/tests/sync031.py create mode 100644 pactest/tests/upgrade032.py diff --git a/contrib/bash_completion b/contrib/bash_completion index 7719285..bb30ffd 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -219,6 +219,7 @@ _pacman () A|U) COMPREPLY=( $( compgen -W '\ --asdeps \ + --asexplicit \ -d --nodeps \ -f --force \ -h --help \ @@ -257,6 +258,7 @@ _pacman () S) COMPREPLY=( $( compgen -W '\ --asdeps \ + --asexplicit \ -c --clean \ -d --nodeps \ -e --dependsonly \ diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 5ea6c33..d0b9e8d 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -90,6 +90,7 @@ _pacman_opts_sync_modifiers=( '*--ignore[Ignore a package upgrade]:package:_pacman_completions_installed_packages' '*--ignoregroup[Ignore a group upgrade]:package group:_pacman_completions_all_groups' '--asdeps[Install packages as non-explicitly installed]' + '--asexplicit[Install packages as explicitly installed]' ) # handles --action subcommand diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 0da83a6..5a64f1a 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -86,11 +86,16 @@ You can also use `pacman -Su` to upgrade all packages that are out of date. See Options ------- *\--asdeps*:: - Install packages non-explicitly; in other works, fake their install reason + Install packages non-explicitly; in other words, fake their install reason to be installed as a dependency. This is useful for makepkg and other build from source tools that need to install dependencies before building the package. +*\--asexplicit*:: + Install packages explicitly; in other words, force their install reason to + explicit. This is useful if you want mark a dependency as explictly + installed. + *-b, \--dbpath* <'path'>:: Specify an alternative database location (a typical default is ``/var/lib/pacman''). This should not be used unless you know what you are diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 72b8934..5f0fbde 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -99,10 +99,6 @@ int _alpm_add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) } } - if(trans->flags & PM_TRANS_FLAG_ALLDEPS) { - pkg->reason = PM_PKG_REASON_DEPEND; - } - /* add the package to the transaction */ trans->packages = alpm_list_add(trans->packages, pkg); @@ -671,12 +667,8 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, /* we'll need to save some record for backup checks later */ oldpkg = _alpm_pkg_dup(local); - /* copy over the install reason (unless alldeps is set) */ - if(trans->flags & PM_TRANS_FLAG_ALLDEPS) { - newpkg->reason = PM_PKG_REASON_DEPEND; - } else { + /* copy over the install reason */ newpkg->reason = alpm_pkg_get_reason(local); - } /* pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { @@ -697,6 +689,13 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count, } } + /* we override any pre-set reason if we have alldeps or allexplicit set */ + if(trans->flags & PM_TRANS_FLAG_ALLDEPS) { + newpkg->reason = PM_PKG_REASON_DEPEND; + } else if(trans->flags & PM_TRANS_FLAG_ALLEXPLICIT) { + newpkg->reason = PM_PKG_REASON_EXPLICIT; + } + if(oldpkg) { /* set up fake remove transaction */ int ret = upgrade_remove(oldpkg, newpkg, trans, db); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 4797fcf..002cabc 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -287,7 +287,8 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_NOSCRIPTLET = 0x400, PM_TRANS_FLAG_NOCONFLICTS = 0x800, PM_TRANS_FLAG_PRINTURIS = 0x1000, - PM_TRANS_FLAG_NEEDED = 0x2000 + PM_TRANS_FLAG_NEEDED = 0x2000, + PM_TRANS_FLAG_ALLEXPLICIT = 0x4000 } pmtransflag_t; /* Transaction Events */ diff --git a/pactest/tests/sync031.py b/pactest/tests/sync031.py new file mode 100644 index 0000000..4aa2ee3 --- /dev/null +++ b/pactest/tests/sync031.py @@ -0,0 +1,19 @@ +self.description = "Sync packages explicitly" + +lp1 = pmpkg("pkg1") +lp1.reason = 1 +self.addpkg2db("local", lp1) + +p1 = pmpkg("pkg1", "1.0-2") +p2 = pmpkg("pkg2", "1.0-2") + +for p in p1, p2: + self.addpkg2db("sync", p) + +self.args = "-S --asexplicit %s" % " ".join([p.name for p in p1, p2]) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("PKG_VERSION=pkg2|1.0-2") +self.addrule("PKG_REASON=pkg1|0") +self.addrule("PKG_REASON=pkg2|0") diff --git a/pactest/tests/upgrade032.py b/pactest/tests/upgrade032.py new file mode 100644 index 0000000..85e048e --- /dev/null +++ b/pactest/tests/upgrade032.py @@ -0,0 +1,19 @@ +self.description = "Install packages explicitly" + +lp1 = pmpkg("pkg1") +lp1.reason = 1 +self.addpkg2db("local", lp1) + +p1 = pmpkg("pkg1", "1.0-2") +p2 = pmpkg("pkg2", "1.0-2") + +for p in p1, p2: + self.addpkg(p) + +self.args = "-U --asexplicit %s" % " ".join([p.filename() for p in p1, p2]) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("PKG_VERSION=pkg2|1.0-2") +self.addrule("PKG_REASON=pkg1|0") +self.addrule("PKG_REASON=pkg2|0") diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 1aa2968..da68f1d 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -79,6 +79,7 @@ static void usage(int op, const char * const myname) printf("%s: %s {-A --add} [%s] <%s>\n", str_usg, myname, str_opt, str_file); printf("%s:\n", str_opt); printf(_(" --asdeps install packages as non-explicitly installed\n")); + printf(_(" --asexplicit install packages as explicitly installed\n")); printf(_(" -d, --nodeps skip dependency checks\n")); printf(_(" -f, --force force install, overwrite conflicting files\n")); } else if(op == PM_OP_REMOVE) { @@ -93,6 +94,7 @@ static void usage(int op, const char * const myname) printf("%s: %s {-U --upgrade} [%s] <%s>\n", str_usg, myname, str_opt, str_file); printf("%s:\n", str_opt); printf(_(" --asdeps install packages as non-explicitly installed\n")); + printf(_(" --asexplicit install packages as explicitly installed\n")); printf(_(" -d, --nodeps skip dependency checks\n")); printf(_(" -f, --force force install, overwrite conflicting files\n")); } else if(op == PM_OP_QUERY) { @@ -115,6 +117,7 @@ static void usage(int op, const char * const myname) printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); printf(_(" --asdeps install packages as non-explicitly installed\n")); + printf(_(" --asexplicit install packages as explicitly installed\n")); printf(_(" -c, --clean remove old packages from cache directory (-cc for all)\n")); printf(_(" -d, --nodeps skip dependency checks\n")); printf(_(" -e, --dependsonly install dependencies only\n")); @@ -341,6 +344,7 @@ static int parseargs(int argc, char *argv[]) {"logfile", required_argument, 0, 1009}, {"ignoregroup", required_argument, 0, 1010}, {"needed", no_argument, 0, 1011}, + {"asexplicit", no_argument, 0, 1012}, {0, 0, 0, 0} }; @@ -412,6 +416,9 @@ static int parseargs(int argc, char *argv[]) FREELIST(list); break; case 1011: config->flags |= PM_TRANS_FLAG_NEEDED; break; + case 1012: + config->flags |= PM_TRANS_FLAG_ALLEXPLICIT; + break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; case 'R': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_REMOVE); break; -- 1.5.3.7

3 5

[pacman-dev] [PATCH] small checkdeps speed-up
by Nagy Gabor 12 Jan '08

12 Jan '08

Hi! Patch attached. Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 4