- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] Only notify of dependency check in removal if performed
by Allan McRae 12 Jan '08

12 Jan '08

3 3

Re: [pacman-dev] [arch-dev-public] [signoff] filesystem 2007.11-5
by Xavier 12 Jan '08

12 Jan '08

Aaron Griffin wrote: > Changes in -5: > Removal of /tmp workaround - FS#7194 close message 7197 is not fixed unfortunately. Note that you had to be careful when testing it, exactly because of the workaround in 7194. That is, you install fileystem package, then see the /tmp permissions are fine, but the permissions were in fact changed by filesystem scriptlet. See http://bugs.archlinux.org/task/7484#comment17619 where I explain why /tmp/ is a special case for pacman. > Removal of pacman dirs - FS#6062 comments That's probably a good thing, pacman needed /var/lib/pacman to install filesystem in the first place anyway. On this topic, shouldn't pacman create this directory itself if it doesn't exist? Note this is exactly the same issue as the recent cachedir change : http://projects.archlinux.org/git/?p=pacman.git;a=commit;h=1a0aaa20df292342… with the following correspondence : alpm_option_add_cachedir <-> alpm_option_set_dbpath _alpm_filecache_setup <-> *_alpm_db_register_local But I am not sure what to think about the following comment (libalpm/db.c, ~560): snprintf(path, PATH_MAX, "%slocal", dbpath); /* TODO this is rediculous, we try to do this even if we can't */ if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) { _alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n", path); if(_alpm_makepath(path) != 0) { RET_ERR(PM_ERR_SYSTEM, NULL); } }

1 0

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

12 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 8ffa6fa7adf291b3dad822c459e1372a31af09f1 (commit) via 8372a9e8c73ed18da5f027c99c8ac48c2f706b55 (commit) via 318d5c4ba87b699c3a902bf906f55a3f905a1650 (commit) via f9a7d8cba4ec1833d32dc8a9403053564b68d18a (commit) from 0a65de10b1cd8bd450e47e735cb909eec13822d0 (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/handle.c | 4 ++-- lib/libalpm/package.c | 2 +- lib/libalpm/package.h | 2 +- lib/libalpm/remove.c | 4 ++-- lib/libalpm/sync.c | 4 ++-- src/pacman/pacman.c | 6 ++---- valgrind.supp | 18 +++++++++++++++++- 7 files changed, 27 insertions(+), 13 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.0-16-g2630556
by Dan McGee 12 Jan '08

12 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 2630556bdef7a07fda056fdcd0a2fa00c3625d3c (commit) via 112caad838762383708d692f6479fe112b35f4fc (commit) via 3e133524a54ab55daff666d26c67ac288b605e92 (commit) via 8ffa6fa7adf291b3dad822c459e1372a31af09f1 (commit) via 8372a9e8c73ed18da5f027c99c8ac48c2f706b55 (commit) via 318d5c4ba87b699c3a902bf906f55a3f905a1650 (commit) via f9a7d8cba4ec1833d32dc8a9403053564b68d18a (commit) via ccc1c731529de16f6fa4064fd992a8f63d7cfc26 (commit) from 0a65de10b1cd8bd450e47e735cb909eec13822d0 (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 2630556bdef7a07fda056fdcd0a2fa00c3625d3c Merge: 112caad838762383708d692f6479fe112b35f4fc 8ffa6fa7adf291b3dad822c459e1372a31af09f1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 11 23:19:52 2008 -0600 Merge branch 'maint' commit 112caad838762383708d692f6479fe112b35f4fc Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Jan 11 21:51:50 2008 +0100 New reason001.py pactest This pactest demonstrates that we should copy the reason between the to-be-replaced and replaced packages Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3e133524a54ab55daff666d26c67ac288b605e92 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 11 01:00:15 2008 -0600 Add functions to manipulate pmdepend_t objects We didn't have a free function before, causing some memory leaks. We also need a dup function now that strings are not in the structure but are dynamically allocated. Also adapt pmdepmissing_t to use a pointer to a depend struct instead of an inclusive one so we can use the functions we created here. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ccc1c731529de16f6fa4064fd992a8f63d7cfc26 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jan 11 00:01:58 2008 -0600 Use dynamic string allocation in package structures This also affects all structures with static strings, such as depmiss, conflict, etc. This should help a lot with memory usage, and hopefully make things a bit more "idiot proof". Currently our pactest pass/fail rate is identical before and after this patch. This is not to say it is a perfect patch- I have yet to pull valgrind out. However, this should be quite safe to use in all situations from here on out, and we can start plugging the memleaks. Original-work-by: Aaron Griffin <aaronmgriffin(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 6 +- lib/libalpm/be_files.c | 194 +++++++++++++++++++++++--------------------- lib/libalpm/conflict.c | 33 ++++++-- lib/libalpm/conflict.h | 15 ++-- lib/libalpm/db.c | 16 ++-- lib/libalpm/deps.c | 98 +++++++++++++++-------- lib/libalpm/deps.h | 15 ++-- lib/libalpm/handle.c | 4 +- lib/libalpm/package.c | 95 ++++++++++++++-------- lib/libalpm/package.h | 31 ++----- lib/libalpm/remove.c | 7 +- lib/libalpm/server.c | 5 +- lib/libalpm/sync.c | 37 ++++++--- lib/libalpm/util.h | 3 +- pactest/tests/reason001.py | 16 ++++ src/pacman/pacman.c | 6 +- src/pacman/util.c | 4 + valgrind.supp | 18 ++++- 18 files changed, 367 insertions(+), 236 deletions(-) create mode 100644 pactest/tests/reason001.py hooks/post-receive -- The official pacman repository

1 0