- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: fix PKGBUILD sanity check
by Allan McRae 13 Jun '09

13 Jun '09

If PKGBUILD was good, the "insane" variable was not defined and so the if statement failed. Simplify and fix this check. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e2e1604..433fe34 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1630,10 +1630,7 @@ if [ "$(type -t package)" = "function" ]; then fi # check the PKGBUILD for some basic requirements -check_sanity || insane=1 -if [ $insane -eq 1 ]; then - exit 1 -fi +check_sanity || exit 1 # We need to run devel_update regardless of whether we are in the fakeroot # build process so that if the user runs makepkg --forcever manually, we -- 1.6.3.2

2 1

Re: [pacman-dev] [arch-general] Package groups
by Xavier 13 Jun '09

13 Jun '09

On Fri, Jun 12, 2009 at 9:44 PM, Aaron Griffin<aaronmgriffin(a)gmail.com> wrote: > On Fri, Jun 12, 2009 at 2:32 PM, Grigorios Bouzakis<grbzks(a)gmail.com> wrote: >> Is it OK for a package in [community] to be part of a package group? >> AFAIK package groups dont exist in [community] or if they do they are >> not the same >> as the ones in extra. >> eg. http://bugs.archlinux.org/task/15053 >> http://repos.archlinux.org/viewvc.cgi/community/gnome/empathy/PKGBUILD?view… >> empathy gets to be part of gnome-extra > > Yeah, as far as I know, this shouldn't happen, as it breaks "pacman -S > gnome-extra" in a way > I don't think it is a problem. pacman will just ask for each repo if you want to install the packages of the group, but it is fine.

1 0

[pacman-dev] My "universal" git repo
by Nagy Gabor 11 Jun '09

11 Jun '09

Hi! http://repo.or.cz/w/pacman-ng.git?a=shortlog;h=refs/heads/universal I've managed to implement some nice features for -U by "moving" upgrade_prepare to sync.c. 1. Conflict resolving should now work (upgrade051.py now passes), FS#3492 implemented. (This was my main motivation.) 2. -U --syncdeps now can resolve dependencies by downloading and installing them from sync repos. In this case, pacman can skip unresolvable targets like with -S. If this patch is going to be accepted, I ask everyone to test "pacman-universal" extensively (there are some changes in UI as well!), because sync.c is quite complex, so it has a chance that I broke something there (and this is a "radical" change, this is a big responsibility). There are no failing pactests, which is a good starting point. Bye

3 3

Re: [pacman-dev] My "universal" git repo
by Nagy Gabor 11 Jun '09

11 Jun '09

> Nagy Gabor wrote: > > Hi! > > > > http://repo.or.cz/w/pacman-ng.git?a=shortlog;h=refs/heads/universal > > > > I've managed to implement some nice features for -U by "moving" > > upgrade_prepare to sync.c. > > > > 1. Conflict resolving should now work (upgrade051.py now passes), > > FS#3492 implemented. (This was my main motivation.) > > 2. -U --syncdeps now can resolve dependencies by downloading and > > installing them from sync repos. In this case, pacman can skip > > unresolvable targets like with -S. > > > > If this patch is going to be accepted, I ask everyone to test > > "pacman-universal" extensively (there are some changes in UI as well!), > > because sync.c is quite complex, so it has a chance that I broke > > something there (and this is a "radical" change, this is a big > > responsibility). There are no failing pactests, which is a good starting > > point. > > > > I had a quick look at the patches and I like what is done. One part > that confuses me is: > > @@ -460,7 > <http://repo.or.cz/w/pacman-ng.git?a=blob;f=src/pacman/pacman.c;h=1629171ba7…> > +462,12 > <http://repo.or.cz/w/pacman-ng.git?a=blob;f=src/pacman/pacman.c;h=690001fe3d…> > @@ static int parseargs(int argc, char *argv[]) > case 'R': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_REMOVE); break; > case 'S': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_SYNC); break; > case 'T': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DEPTEST); break; > - case 'U': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); break; > + case 'U': > + config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); > + if(!config->op_u_syncdeps) { > + config->flags |= PM_TRANS_FLAG_NORESOLVEDEPS; > + } > + break; > case 'V': config->version = 1; break; > case 'b': > config->dbpath = strdup(optarg); > @@ -506,6 > <http://repo.or.cz/w/pacman-ng.git?a=blob;f=src/pacman/pacman.c;h=1629171ba7…> > +513,8 > <http://repo.or.cz/w/pacman-ng.git?a=blob;f=src/pacman/pacman.c;h=690001fe3d…> > @@ static int parseargs(int argc, char *argv[]) > } else { > config->flags |= PM_TRANS_FLAG_RECURSE; > } > + config->op_u_syncdeps = 1; > + config->flags &= ~PM_TRANS_FLAG_NORESOLVEDEPS; > break; > case 't': > config->op_q_unrequired = 1; > > > So the "case U:" part sets PM_TRANS_FLAG_NORESOLVEDEPS by default and > then the "case s:" makes sure it is not set? Or am I reading that wrong > (binary operators and me are not friends...). -U sets that flag (if -s was not invoked before, this check is because of -sU should do the same), -s unsets that flag. > Would it not be better to use "PM_TRANS_FLAG_RESOLVEDEPS" and then "case > U" stays the same, "case s:" sets it. I suppose that would make the > test in _alpm_sync_prepare more difficult. You are right here, this codepart would look better with PM_TRANS_FLAG_RESOLVEDEPS. I decided to go with NORESOLVEDEPS, because RESOLVEDEPS is the default behavior (for -S), and usually we have a flag for the non-default setting (NODEPS, NOCONFLICTS etc). With RESOLVEDEPS, that flag should be always passed with -S. > Or (my favourite), get rid of this altogether and just assume the deps > are to be resolved by default and expect "-Ud" if someone does not want > that to be done? I can not see a reason someone would not want to sync > deps if there are not already installed and it makes the -U and -S > operations even more universal. Yes, I was also thinking about this, but I decided to keep the old default behaviour as much as possible. [Btw, we have a hidden API change here, alpm front-ends have to pass PM_TRANS_FLAG_NORESOLVEDEPS with -U to keep the old behavior.] If Dan also prefers your way, I will happily implement that (because the code would be nicer, indeed). Bye

1 0

[pacman-dev] [PATCH] Enable remove progressbar with -S (conflict resolving)
by Nagy Gabor 11 Jun '09

11 Jun '09

>From 0880c6a0f60e8377197f00bd5fab3652a3e40f39 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 10 Jun 2009 20:22:04 +0200 Subject: [PATCH] Enable remove progressbar with -S (conflict resolving) $ sudo pacman -S mc Old output: *********** :: mc conflicts with mc-mp. Remove mc-mp? [Y/n] y ... (1/1) checking for file conflicts [################] 100% (1/1) installing mc [################] 100% New output: *********** :: mc conflicts with mc-mp. Remove mc-mp? [Y/n] y ... (1/1) checking for file conflicts [################] 100% (1/1) removing mc-mp [################] 100% (1/1) installing mc [################] 100% Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- 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 d366ee1..c7ac966 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -942,6 +942,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) } /* we want the frontend to be aware of commit details */ tr_remove->cb_event = trans->cb_event; + tr_remove->cb_progress = trans->cb_progress; if(_alpm_trans_commit(tr_remove, NULL) == -1) { _alpm_log(PM_LOG_ERROR, _("could not commit removal transaction\n")); goto error; -- 1.6.0.3

2 1

[pacman-dev] [PATCH] makepkg: fix variable backup/restore for splitpkg
by Allan McRae 09 Jun '09

09 Jun '09

The backup and restore of variables that can be overridden while making split packages only dealt with the first element, not the whole array (FS#15010). Adjust the bash voodoo to fix it... Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f46b7f8..e2e1604 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1262,7 +1262,7 @@ devel_update() { backup_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" - eval "${indirect}=\"${!var}\"" + eval "${indirect}=(\${$var[@]})" done } @@ -1270,7 +1270,7 @@ restore_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" if [ -n "${!indirect}" ]; then - eval "${var}=\"${!indirect}\"" + eval "${var}=(\${$indirect[@]})" else unset ${var} fi -- 1.6.3.2

2 2

[pacman-dev] Pacman "Roadmap"
by Allan McRae 09 Jun '09

09 Jun '09

Hi everybody, Over the past year, various discussions have occurred about nice features to be included in pacman, but many have not yet been implemented. So they didn't get lost, I made a small wiki page with them: http://wiki.archlinux.org/index.php/Pacman_Roadmap Of course there are many other areas to improve (see bug tracker...), but I tried to select "big" features that someone could probably make a reasonable start on without knowing the pacman code base by heart. I.e. features big enough to warrant a 3.x release and not a 4.0 one. Feel free to add ideas in that category that I have missed but remember all discussion of new ideas should occur on this list first... Cheers, Allan

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-175-gaa579b8
by dan＠archlinux.org 09 Jun '09

09 Jun '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 aa579b843899ccba093f83faa942599ce1110c24 (commit) via 19b8b638851713da64dd2aa7ff31e911ffe925cd (commit) via e61ab1536f4b198ac5c62cf68d706d93bc6481be (commit) via 13b281d74380d9622574bd546e7f9084054ae289 (commit) from 9af9c0f328094228fa363d842ddc9b2a605f0d22 (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 aa579b843899ccba093f83faa942599ce1110c24 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jun 6 11:03:29 2009 -0500 Give sensible feedback when a repo has no configured servers This fixes FS#14899. When running an -Sp operation without servers configured for a repository, we would segfault, so add an assert to the backend method returning the first server preventing a null pointer dereference. In addition, add a new error code to libalpm that indicates we have no servers configured for a repository. This makes -Sy and -S <package> operations fail gracefully and helpfully when a repo is set up with no servers, as the default mirrorlist in Arch is provided this way. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 19b8b638851713da64dd2aa7ff31e911ffe925cd Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Jun 7 14:30:11 2009 +0200 Introduce _alpm_pkg_free_trans() The main purpose of this function to make our code more readable. It frees transaction specific fields of pmpkg_t. (It is used when a package is removed from the target list.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e61ab1536f4b198ac5c62cf68d706d93bc6481be Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jun 6 12:49:37 2009 -0500 makepkg: refactor sanity checking into a function No new checks, just move it into a function and return 1 rather than exit directly. This also allows the use of local variables. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 13b281d74380d9622574bd546e7f9084054ae289 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri May 22 00:24:26 2009 +0200 xdelta : only handle gz compression specifically There is apparently no need to handle the re-compression manually when applying a xdelta patch in case of bzip2 or xz. Only gzip needs to be handled specifically for disabling timestamp with the -n option. After this patch, if xdelta is enhanced with xz support (1-line patch), it will be transparent from pacman side. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 1 + lib/libalpm/db.c | 1 + lib/libalpm/dload.c | 2 + lib/libalpm/error.c | 2 + lib/libalpm/package.c | 13 +++++ lib/libalpm/package.h | 1 + lib/libalpm/sync.c | 26 ++++------ lib/libalpm/trans.c | 7 +-- scripts/makepkg.sh.in | 142 ++++++++++++++++++++++++++----------------------- src/pacman/sync.c | 10 +++- 10 files changed, 116 insertions(+), 89 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Introduce _alpm_pkg_free_trans()
by Nagy Gabor 07 Jun '09

07 Jun '09

The main purpose of this function to make our code more readable. It frees transaction specific fields of pmpkg_t. (It is used when a package is removed from the target list.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/package.c | 13 +++++++++++++ lib/libalpm/package.h | 1 + lib/libalpm/sync.c | 11 +++-------- lib/libalpm/trans.c | 7 +------ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index b63b5ec..8e41456 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -857,6 +857,19 @@ void _alpm_pkg_free(pmpkg_t *pkg) FREE(pkg); } +/* Free transaction specific fields */ +void _alpm_pkg_free_trans(pmpkg_t *pkg) +{ + ALPM_LOG_FUNC; + + if(pkg == NULL) { + return; + } + + alpm_list_free(pkg->removes); + pkg->removes = NULL; +} + /* Is spkg an upgrade for locapkg? */ int _alpm_pkg_compare_versions(pmpkg_t *spkg, pmpkg_t *localpkg) { diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 87e8179..4e4a7b9 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -79,6 +79,7 @@ struct __pmpkg_t { pmpkg_t* _alpm_pkg_new(void); pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg); void _alpm_pkg_free(pmpkg_t *pkg); +void _alpm_pkg_free_trans(pmpkg_t *pkg); int _alpm_pkg_cmp(const void *p1, const void *p2); int _alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg); pmpkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index ccd6424..d4632d2 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -391,12 +391,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } /* Unresolvable packages will be removed from the target list, so - we free the transaction specific field: pkg->removes */ - for(i = unresolvable; i; i = i->next) { - pmpkg_t *pkg = i->data; - alpm_list_free(pkg->removes); - pkg->removes = NULL; - } + we free the transaction specific fields */ + alpm_list_free_inner(unresolvable, (alpm_list_fn_free)_alpm_pkg_free_trans); /* Set DEPEND reason for pulled packages */ for(i = resolved; i; i = i->next) { @@ -470,8 +466,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync _alpm_log(PM_LOG_WARNING, _("removing '%s' from target list because it conflicts with '%s'\n"), rsync->name, sync->name); - alpm_list_free(rsync->removes); /* rsync is not transaction target anymore */ - rsync->removes = NULL; + _alpm_pkg_free_trans(rsync); /* rsync is not transaction target anymore */ trans->packages = alpm_list_remove(trans->packages, rsync, _alpm_pkg_cmp, NULL); continue; } diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 6317b69..99ef9f7 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -248,12 +248,7 @@ void _alpm_trans_free(pmtrans_t *trans) } if(trans->type == PM_TRANS_TYPE_SYNC) { - alpm_list_t *i; - for(i = trans->packages; i; i = i->next) { - pmpkg_t *pkg = i->data; - alpm_list_free(pkg->removes); - pkg->removes = NULL; - } + alpm_list_free_inner(trans->packages, (alpm_list_fn_free)_alpm_pkg_free_trans); } else { alpm_list_free_inner(trans->packages, (alpm_list_fn_free)_alpm_pkg_free); } -- 1.6.3.2

2 1

[pacman-dev] [PATCH] makepkg: refactor sanity checking into a function
by Dan McGee 07 Jun '09

07 Jun '09

No new checks, just move it into a function and return 1 rather than exit directly. This also allows the use of local variables. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 142 ++++++++++++++++++++++++++----------------------- 1 files changed, 76 insertions(+), 66 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cb63f9a..f46b7f8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1103,6 +1103,79 @@ install_package() { fi } +check_sanity() { + # check for no-no's in the build script + if [ -z "$pkgname" ]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgname" + return 1 + fi + if [ -z "$pkgver" ]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgver" + return 1 + fi + if [ -z "$pkgrel" ]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgrel" + return 1 + fi + if [ "$pkgver" != "${pkgver//-/}" ]; then + error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" + return 1 + fi + if [ "$pkgrel" != "${pkgrel//-/}" ]; then + error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" + return 1 + fi + + 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.")" "$pkgbase" "$CARCH" + plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" + plain "$(gettext "such as arch=('%s').")" "$CARCH" + return 1 + fi + fi + + local provide + for provide in ${provides[@]}; do + if [ $provide != ${provide//</} -o $provide != ${provide//>/} ]; then + error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" + return 1 + fi + done + + if [ "$install" -a ! -f "$install" ]; then + error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" + return 1 + fi + + local valid_options=1 + local opt known kopt + for opt in ${options[@]}; do + known=0 + # check if option matches a known option or its inverse + for kopt in ${packaging_options[@]} ${other_options[@]}; do + if [ "${opt}" = "${kopt}" -o "${opt}" = "!${kopt}" ]; then + known=1 + fi + done + if [ $known -eq 0 ]; then + error "$(gettext "options array contains unknown option '%s'")" "$opt" + valid_options=0 + fi + done + if [ $valid_options -eq 0 ]; then + return 1 + fi + + return 0 +} + devel_check() { newpkgver="" @@ -1556,74 +1629,11 @@ if [ "$(type -t package)" = "function" ]; then PKGFUNC=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" - exit 1 -fi -if [ -z "$pkgver" ]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgver" - exit 1 -fi -if [ -z "$pkgrel" ]; then - error "$(gettext "%s is not allowed to be empty.")" "pkgrel" - exit 1 -fi -if [ "$pkgver" != "${pkgver//-/}" ]; then - error "$(gettext "%s is not allowed to contain hyphens.")" "pkgver" - exit 1 -fi -if [ "$pkgrel" != "${pkgrel//-/}" ]; then - error "$(gettext "%s is not allowed to contain hyphens.")" "pkgrel" - exit 1 -fi - -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.")" "$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 - fi -fi - -for provide in ${provides[@]}; do - if [ $provide != ${provide//</} -o $provide != ${provide//>/} ]; then - error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" - exit 1 - fi -done -unset provide - -if [ "$install" -a ! -f "$install" ]; then - error "$(gettext "Install scriptlet (%s) does not exist.")" "$install" - exit 1 -fi - -valid_options=1 -for opt in ${options[@]}; do - known=0 - # check if option matches a known option or its inverse - for kopt in ${packaging_options[@]} ${other_options[@]}; do - if [ "${opt}" = "${kopt}" -o "${opt}" = "!${kopt}" ]; then - known=1 - fi - done - if [ $known -eq 0 ]; then - error "$(gettext "options array contains unknown option '%s'")" "$opt" - valid_options=0 - fi -done -if [ $valid_options -eq 0 ]; then +# check the PKGBUILD for some basic requirements +check_sanity || insane=1 +if [ $insane -eq 1 ]; then exit 1 fi -unset valid_options opt known kopt # We need to run devel_update regardless of whether we are in the fakeroot # build process so that if the user runs makepkg --forcever manually, we -- 1.6.3.2

2 1

[pacman-dev] [PATCH 1/3] Give sensible feedback when a repo has no configured servers
by Dan McGee 06 Jun '09

06 Jun '09

This fixes FS#14899. When running an -Sp operation without servers configured for a repository, we would segfault, so add an assert to the backend method returning the first server preventing a null pointer dereference. In addition, add a new error code to libalpm that indicates we have no servers configured for a repository. This makes -Sy and -S <package> operations fail gracefully and helpfully when a repo is set up with no servers, as the default mirrorlist in Arch is provided this way. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.h | 1 + lib/libalpm/db.c | 1 + lib/libalpm/dload.c | 2 ++ lib/libalpm/error.c | 2 ++ lib/libalpm/sync.c | 4 +++- src/pacman/sync.c | 10 +++++++++- 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 5cf1e94..1b67f8a 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -480,6 +480,7 @@ enum _pmerrno_t { PM_ERR_DB_REMOVE, /* Servers */ PM_ERR_SERVER_BAD_URL, + PM_ERR_SERVER_NONE, /* Transactions */ PM_ERR_TRANS_NOT_NULL, PM_ERR_TRANS_NULL, diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 561967c..6749ab1 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -232,6 +232,7 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db) /* Sanity checks */ ASSERT(handle != NULL, return(NULL)); ASSERT(db != NULL, return(NULL)); + ASSERT(db->servers != NULL, return(NULL)); url = (char*)db->servers->data; diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 5b0a691..aec0b5c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -388,6 +388,8 @@ int _alpm_download_single_file(const char *filename, alpm_list_t *i; int ret = -1; + ASSERT(servers != NULL, RET_ERR(PM_ERR_SERVER_NONE, -1)); + for(i = servers; i; i = i->next) { const char *server = i->data; char *fileurl = NULL; diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index fdff9ed..47e254e 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -84,6 +84,8 @@ const char SYMEXPORT *alpm_strerror(int err) /* Servers */ case PM_ERR_SERVER_BAD_URL: return _("invalid url for server"); + case PM_ERR_SERVER_NONE: + return _("no servers configured for repository"); /* Transactions */ case PM_ERR_TRANS_NOT_NULL: return _("transaction already initialized"); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index abda147..519066c 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -777,7 +777,9 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) if(_alpm_download_files(files, current->servers, cachedir)) { _alpm_log(PM_LOG_WARNING, _("failed to retrieve some files from %s\n"), current->treename); - pm_errno = PM_ERR_RETRIEVE; + if(pm_errno == 0) { + pm_errno = PM_ERR_RETRIEVE; + } goto error; } FREELIST(files); diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 68fb81a..2e57b01 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -675,7 +675,15 @@ static int sync_trans(alpm_list_t *targets) for(i = packages; i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); pmdb_t *db = alpm_pkg_get_db(pkg); - printf("%s/%s\n", alpm_db_get_url(db), alpm_pkg_get_filename(pkg)); + const char *dburl = alpm_db_get_url(db); + if(dburl) { + printf("%s/%s\n", dburl, alpm_pkg_get_filename(pkg)); + } else { + /* can't use WARNING here, we don't show warnings in -Sp... */ + pm_fprintf(stderr, PM_LOG_ERROR, _("no database for package: %s\n"), + alpm_pkg_get_name(pkg)); + } + } /* we are done */ goto cleanup; -- 1.6.3.2

3 3

[pacman-dev] [PATCH] Allow remove to accept 'local/' prefix
by Dan McGee 06 Jun '09

06 Jun '09

See FS#14542- this allows -Qs output to be fed back into pacman without problems or having to strip off the 'local/' prefix manually. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/remove.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 9dfff9c..62fd396 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -49,6 +49,7 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) { pmpkg_t *info; + const char *targ; ALPM_LOG_FUNC; @@ -56,12 +57,19 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - if(_alpm_pkg_find(trans->packages, name)) { + targ = strchr(name, '/'); + if(targ && strncmp(name, "local", 5) == 0) { + targ++; + } else { + targ = name; + } + + if(_alpm_pkg_find(trans->packages, targ)) { RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } - if((info = _alpm_db_get_pkgfromcache(db, name)) == NULL) { - _alpm_log(PM_LOG_DEBUG, "could not find %s in database\n", name); + if((info = _alpm_db_get_pkgfromcache(db, targ)) == NULL) { + _alpm_log(PM_LOG_DEBUG, "could not find %s in database\n", targ); RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); } -- 1.6.3.2

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-171-g9af9c0f
by dan＠archlinux.org 06 Jun '09

06 Jun '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 9af9c0f328094228fa363d842ddc9b2a605f0d22 (commit) from f4ecc908eccc3ace2e40b15be837e4fa44ecf0a0 (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 9af9c0f328094228fa363d842ddc9b2a605f0d22 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Jun 5 14:40:41 2009 +0200 Document -T in the manual See FS#14833. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> [Dan: slight wording rework] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Document -T in the manual
by Nagy Gabor 05 Jun '09

05 Jun '09

See FS#14833. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 195135b..0d86bad 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -80,6 +80,13 @@ to determine which packages need upgrading. This behavior operates as follows: Numeric: 1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0 +*-T, \--deptest*:: + Check dependencies. This operation will check each dependency specified + and return a list of those which are not currently satisfied on the + system. This is mostly useful in scripts, for example, makepkg uses this + to check dependencies. This operation accepts no other options. Example + usage: `pacman -T qt "bash>=3.2"`. + *-U, \--upgrade*:: Upgrade or add package(s) to the system. Either a URL or file path can be specified. This is a ``remove-then-add'' process. See <<HCF,Handling Config -- 1.6.3.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-170-gf4ecc90
by dan＠archlinux.org 02 Jun '09

02 Jun '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 f4ecc908eccc3ace2e40b15be837e4fa44ecf0a0 (commit) via c520d3845113ce4dc1a473c012288da7f2a655b8 (commit) via 1b4135ca5d0654d18398d648ba48ecf14caa2289 (commit) via 6360fe01007f34b1fa2285b6c741d2dffb81da28 (commit) via 30e2496775897644fb397b32e8bdf0ae2f827216 (commit) from 35b9dfc3805821cb504231a5e5ce5a8694278fb7 (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 f4ecc908eccc3ace2e40b15be837e4fa44ecf0a0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat May 16 17:59:45 2009 +0200 We don't need root with -Sp FS#8905 is fixed. The front-end passes PM_TRANS_FLAG_NOLOCK to the back-end, so it doesn't lock the database. That's why we don't need root anymore. I reworked (and renamed) needs_transaction() accordingly. I also added missing -Sc check there (for example, -Sci didn't print non-root error, but pacman wanted to lock the database). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c520d3845113ce4dc1a473c012288da7f2a655b8 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat May 16 16:54:21 2009 +0200 Introduce PM_TRANS_FLAG_NOLOCK This flag indicates that the front-end will not call alpm_trans_commit(), so the database needn't be locked. This is the first step toward fixing FS#8905. If this flag is set, alpm_trans_commit() does nothing and returns with an error (that has new code: PM_ERR_TRANS_NOT_LOCKED). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b4135ca5d0654d18398d648ba48ecf14caa2289 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri May 22 01:06:33 2009 +0200 Change package to package(s) and file to file(s) in documentation The pacman --help pages and the manual suggested that only one package can be upgraded/removed per transaction. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6360fe01007f34b1fa2285b6c741d2dffb81da28 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Thu May 21 01:19:37 2009 -0300 Remove unused string.h from src/pacman/remove.c This header was used in the code for the function strdup() that is not used anymore. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 30e2496775897644fb397b32e8bdf0ae2f827216 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Feb 26 18:16:23 2009 +0100 repo-add: fail early if repo can not be created Before this commit, the repo creation could fail after all packages have been added to the database. Now this will be detected before adding anything. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 4 ++-- lib/libalpm/alpm.h | 4 +++- lib/libalpm/error.c | 2 ++ lib/libalpm/trans.c | 32 ++++++++++++++++++++------------ scripts/repo-add.sh.in | 14 ++++++++++++-- src/pacman/pacman.c | 7 ++++--- src/pacman/remove.c | 1 - src/pacman/util.c | 19 ++++++++----------- src/pacman/util.h | 2 +- 9 files changed, 52 insertions(+), 33 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Awesome local DB corruption
by Dan McGee 02 Jun '09

02 Jun '09

As an FYI for those that don't crawl the bug list looking for new things: http://bugs.archlinux.org/task/14914

1 0

Re: [pacman-dev] Bump on upgrade046.py
by Nagy Gabor 01 Jun '09

01 Jun '09

> Nagy Gabor wrote: > > I thought -Suf cannot hurt anything, so I just did -Suf. > > I still can't believe you did that! I always say the guideline is to > only use -f for one package at a time. Yes, I always say that, too (on #archlinux.hu irc channel). At least now I can show a concrete example (link to this thread), why it is not recommended to do that. ;-) But the point is that if pacman _were_ bug-free, my -Suf would not break anything! > BTW, -Sud is also bad! :) Yes. In fact, this was the main reason for -f. I have to choose between breaking some deps* (when your system is really outdated, I am pretty sure, that you will break some ("inverse") deps with -Sf, I did it many times ;-) and force. Clearly, I made a bad decision (I forgot about the upgrade046.py bug).

1 0

[pacman-dev] Bump on upgrade046.py
by Nagy Gabor 01 Jun '09

01 Jun '09

Hi! I think this bug has just hurted my system today. Since I have no net in my sublet, I do -Su very rarely, so today's sysupgrade upgraded 415 packages (my system was ~0.7 year-old). I got lots of false fileconflict errors first (probably due to the symlink bug). I was lazy to resolve all of them by hand, and since I never put untracked files out of my home dir, I thought -Suf cannot hurt anything, so I just did -Suf. During sysupgrade, lots of "gconftool-2: error while loading shared libraries: libdbus-1.so.3: cannot open shared object file: No such file or directory" messages popped up (install scriptlets). Wow :-(. After pacman -Suf had finished, I did some investigation (I didn't want to press ctrl-c during sysupgrade). First I thought, that there is a missing dependency around gconf (testdb said that my local database was consistent), but I was wrong: I had the package dbus-core installed (up-to-date version), which should contain the missing lib (-Ql), but the file libdbus-1.so.3 was not found in /usr/lib. I guess, I've just run into the file relocation bug (otherwise, we have a more serious bug here), showed by upgrade046.py. Briefly, the file relocation check is hacked into the fileconflict check, which is omitted with -f. Bye P.S.: I used pacman 3.2.2-1.

2 2

[pacman-dev] [PATCH] Change package to package(s) and file to file(s) in documentation
by Nagy Gabor 21 May '09

21 May '09

From 2f51241a85f1df7219ae0649bff9a0de369a8c84 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 22 May 2009 01:06:33 +0200 Subject: [PATCH] Change package to package(s) and file to file(s) in documentation The pacman --help pages and the manual suggested that only one package can be upgraded/removed per transaction. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 4 ++-- src/pacman/pacman.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 4b7cf2d..195135b 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -45,7 +45,7 @@ Operations list. See <<QO,Query Options>> below. *-R, \--remove*:: - Remove a package from the system. Groups can also be specified to be + Remove package(s) from the system. Groups can also be specified to be removed, in which case every package in that group will be removed. Files belonging to the specified package will be deleted, and the database will be updated. Most configuration files will be saved @@ -81,7 +81,7 @@ to determine which packages need upgrading. This behavior operates as follows: 1 < 1.0 < 1.1 < 1.1.1 < 1.2 < 2.0 < 3.0.0 *-U, \--upgrade*:: - Upgrade or add a package to the system. Either a URL or file path can be + Upgrade or add package(s) to the system. Either a URL or file path can be specified. This is a ``remove-then-add'' process. See <<HCF,Handling Config Files>> for an explanation on how pacman takes care of config files. diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index c817828..1629171 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -65,8 +65,8 @@ static void usage(int op, const char * const myname) /* prefetch some strings for usage below, which moves a lot of calls * out of gettext. */ char const * const str_opt = _("options"); - char const * const str_file = _("file"); - char const * const str_pkg = _("package"); + char const * const str_file = _("file(s)"); + char const * const str_pkg = _("package(s)"); char const * const str_usg = _("usage"); char const * const str_opr = _("operation"); -- 1.6.3.1

1 0

[pacman-dev] [PATCH] Introduce -D, --database
by Nagy Gabor 21 May '09

21 May '09

>From d20f84a86432bee553abdc2c485d953dc9ec6b3f Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed, 20 May 2009 21:46:23 +0200 Subject: [PATCH] Introduce -D, --database The request of FS#12950 is implemented. On the backend side, I introduced a new function, alpm_db_set_pkgreason(), to modify the install reason of a package in the local database. On the front-end side, I introduced a new main operation, -D/--database, which has two options, --asdeps and --asexplicit. I documented this in pacman manual. I've created two pactests to test -D: database001.py and database002.py. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 12 +++++- lib/libalpm/alpm.h | 16 +++++--- lib/libalpm/db.c | 34 ++++++++++++++++ pactest/tests/database001.py | 11 +++++ pactest/tests/database002.py | 11 +++++ src/pacman/Makefile.am | 1 + src/pacman/conf.h | 3 +- src/pacman/database.c | 90 ++++++++++++++++++++++++++++++++++++++++++ src/pacman/pacman.c | 22 ++++++++-- src/pacman/pacman.h | 2 + src/pacman/util.c | 2 +- 11 files changed, 189 insertions(+), 15 deletions(-) create mode 100644 pactest/tests/database001.py create mode 100644 pactest/tests/database002.py create mode 100644 src/pacman/database.c diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index e914ab4..4b7cf2d 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -28,6 +28,12 @@ front ends to be written (for instance, a GUI front end). Operations ---------- +*-D, \--database*:: + Modify the package database. This options allows you to modify certain + attributes of the installed packages in pacman's database. At the + moment, you can only change the install reason. See the '\--asdeps' + and '\--asexplicit' options below. + *-Q, \--query*:: Query the package database. This operation allows you to view installed packages and their files, as well as meta-information about individual @@ -93,13 +99,15 @@ Options 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. + the package. This option can be also used in combination with '-D' to + change the install reason of local packages without reinstalling. *\--asexplicit*:: Install packages explicitly; in other words, fake their install reason to be explicitly installed. This is useful if you want to mark a dependency as explicitly installed so it will not be removed by the '\--recursive' - remove operation. + remove operation. This option can be also used in combination with '-D' + to change the install reason of local packages without reinstalling. *-b, \--dbpath* <'path'>:: Specify an alternative database location (a typical default is diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 1e22a59..94c3b67 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -147,6 +147,15 @@ pmdb_t *alpm_option_get_localdb(); alpm_list_t *alpm_option_get_syncdbs(); /* + * Install reasons -- ie, why the package was installed + */ + +typedef enum _pmpkgreason_t { + PM_PKG_REASON_EXPLICIT = 0, /* explicitly requested by the user */ + PM_PKG_REASON_DEPEND = 1 /* installed as a dependency for another package */ +} pmpkgreason_t; + +/* * Databases */ @@ -169,6 +178,7 @@ alpm_list_t *alpm_db_get_pkgcache(pmdb_t *db); pmgrp_t *alpm_db_readgrp(pmdb_t *db, const char *name); alpm_list_t *alpm_db_get_grpcache(pmdb_t *db); alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles); +int alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason); /* * Packages @@ -176,12 +186,6 @@ alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles); /* Info parameters */ -/* reasons -- ie, why the package was installed */ -typedef enum _pmpkgreason_t { - PM_PKG_REASON_EXPLICIT = 0, /* explicitly requested by the user */ - PM_PKG_REASON_DEPEND = 1 /* installed as a dependency for another package */ -} pmpkgreason_t; - int alpm_pkg_load(const char *filename, unsigned short full, pmpkg_t **pkg); int alpm_pkg_free(pmpkg_t *pkg); int alpm_pkg_checkmd5sum(pmpkg_t *pkg); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 561967c..941b56d 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -319,6 +319,40 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles) return(_alpm_db_search(db, needles)); } +/* Set install reason for a package in db + * @param db pointer to the package database + * @param name the name of the package + * @param reason the new install reason + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ +int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); + ASSERT(db != NULL && name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); + + pmpkg_t *pkg = _alpm_db_get_pkgfromcache(db, name); + if(pkg == NULL) { + RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); + } + + _alpm_log(PM_LOG_DEBUG, "setting install reason %u for %s/%s\n", reason, db->treename, name); + /* read DESC */ + if(_alpm_db_read(db, pkg, INFRQ_DESC)) { + return(-1); + } + /* set reason (in pkgcache) */ + pkg->reason = reason; + /* write DESC */ + if(_alpm_db_write(db, pkg, INFRQ_DESC)) { + return(-1); + } + + return(0); +} + /** @} */ pmdb_t *_alpm_db_new(const char *dbpath, const char *treename) diff --git a/pactest/tests/database001.py b/pactest/tests/database001.py new file mode 100644 index 0000000..de4c040 --- /dev/null +++ b/pactest/tests/database001.py @@ -0,0 +1,11 @@ +self.description = "-D --asdeps" + +lp = pmpkg("pkg") +lp.reason = 0 +self.addpkg2db("local", lp) + +self.args = "-D pkg --asdeps" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg") +self.addrule("PKG_REASON=pkg|1") diff --git a/pactest/tests/database002.py b/pactest/tests/database002.py new file mode 100644 index 0000000..05fa7f4 --- /dev/null +++ b/pactest/tests/database002.py @@ -0,0 +1,11 @@ +self.description = "-D --asexplicit" + +lp = pmpkg("pkg") +lp.reason = 1 +self.addpkg2db("local", lp) + +self.args = "-D pkg --asexplicit" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg") +self.addrule("PKG_REASON=pkg|0") diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index 220ee9c..8c14562 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -24,6 +24,7 @@ endif pacman_SOURCES = \ conf.h conf.c \ + database.c \ deptest.c \ package.h package.c \ pacman.h pacman.c \ diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 466d983..f6cbb85 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -80,7 +80,8 @@ enum { PM_OP_UPGRADE, PM_OP_QUERY, PM_OP_SYNC, - PM_OP_DEPTEST + PM_OP_DEPTEST, + PM_OP_DATABASE }; /* clean method */ diff --git a/src/pacman/database.c b/src/pacman/database.c new file mode 100644 index 0000000..89ea5d9 --- /dev/null +++ b/src/pacman/database.c @@ -0,0 +1,90 @@ +/* + * database.c + * + * Copyright (c) 2002-2007 by Judd Vinet <jvinet(a)zeroflux.org> + * + * 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/>. + */ + +#include "config.h" + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> + +#include <alpm.h> +#include <alpm_list.h> + +/* pacman */ +#include "pacman.h" +#include "conf.h" +#include "util.h" + +extern pmdb_t *db_local; + +/** + * @brief Modify the 'local' package database. + * + * @param targets a list of packages (as strings) to modify + * + * @return 0 on success, 1 on failure + */ +int pacman_database(alpm_list_t *targets) +{ + alpm_list_t *i; + int retval = 0; + pmpkgreason_t reason; + + if(targets == NULL) { + pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n")); + return(1); + } + + if(config->flags & PM_TRANS_FLAG_ALLDEPS) { /* --asdeps */ + reason = PM_PKG_REASON_DEPEND; + } else if(config->flags & PM_TRANS_FLAG_ALLEXPLICIT) { /* --asexplicit */ + reason = PM_PKG_REASON_EXPLICIT; + } else { + pm_printf(PM_LOG_ERROR, _("no install reason specified (use -h for help)\n")); + return(1); + } + + /* Lock database */ + if(trans_init(PM_TRANS_TYPE_SYNC, 0) == -1) { + return(1); + } + + for(i = targets; i; i = alpm_list_next(i)) { + char *pkgname = i->data; + if(alpm_db_set_pkgreason(db_local, pkgname, reason)) { + pm_printf(PM_LOG_ERROR, _("could not set install reason for package %s (%s)\n"), + pkgname, alpm_strerrorlast()); + retval = 1; + } else { + if(reason == PM_PKG_REASON_DEPEND) { + printf(_("%s: install reason has been changed to 'installed as dependency'\n"), pkgname); + } else { + printf(_("%s: install reason has been changed to 'explicitly installed'\n"), pkgname); + } + } + } + + /* Unlock database */ + if(trans_release() == -1) { + return(1); + } + return(retval); +} + +/* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 3b8636c..c817828 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -75,10 +75,11 @@ static void usage(int op, const char * const myname) printf(_("operations:\n")); printf(" %s {-h --help}\n", myname); printf(" %s {-V --version}\n", myname); - printf(" %s {-Q --query} [%s] [%s]\n", myname, str_opt, str_pkg); - printf(" %s {-R --remove} [%s] <%s>\n", myname, str_opt, str_pkg); - printf(" %s {-S --sync} [%s] [%s]\n", myname, str_opt, str_pkg); - printf(" %s {-U --upgrade} [%s] <%s>\n", myname, str_opt, str_file); + printf(" %s {-D --database} <%s> <%s>\n", myname, str_opt, str_pkg); + printf(" %s {-Q --query} [%s] [%s]\n", myname, str_opt, str_pkg); + printf(" %s {-R --remove} [%s] <%s>\n", myname, str_opt, str_pkg); + printf(" %s {-S --sync} [%s] [%s]\n", myname, str_opt, str_pkg); + printf(" %s {-U --upgrade} [%s] <%s>\n", myname, str_opt, str_file); printf(_("\nuse '%s {-h --help}' with an operation for available options\n"), myname); } else { @@ -136,6 +137,11 @@ static void usage(int op, const char * const myname) printf(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); printf(_(" -q, --quiet show less information for query and search\n")); + } else if (op == PM_OP_DATABASE) { + printf("%s: %s {-D --database} <%s> <%s>\n", str_usg, myname, str_opt, str_pkg); + printf("%s:\n", str_opt); + printf(_(" --asdeps mark packages as non-explicitly installed\n")); + printf(_(" --asexplicit mark packages as explicitly installed\n")); } printf(_(" --config <path> set an alternate configuration file\n")); printf(_(" --logfile <path> set an alternate log file\n")); @@ -326,6 +332,8 @@ static int parseargs(int argc, char *argv[]) int option_index = 0; static struct option opts[] = { + + {"database", no_argument, 0, 'D'}, {"query", no_argument, 0, 'Q'}, {"remove", no_argument, 0, 'R'}, {"sync", no_argument, 0, 'S'}, @@ -376,7 +384,7 @@ static int parseargs(int argc, char *argv[]) {0, 0, 0, 0} }; - while((opt = getopt_long(argc, argv, "RUFQSTr:b:vkhscVfmnoldepqituwygz", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "RUDQSTr:b:vkhscVfmnoldepqituwygz", opts, &option_index))) { alpm_list_t *list = NULL, *item = NULL; /* lists for splitting strings */ if(opt < 0) { @@ -447,6 +455,7 @@ static int parseargs(int argc, char *argv[]) case 1012: config->flags |= PM_TRANS_FLAG_ALLEXPLICIT; break; + case 'D': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_DATABASE); 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; case 'S': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_SYNC); break; @@ -932,6 +941,9 @@ int main(int argc, char *argv[]) /* start the requested operation */ switch(config->op) { + case PM_OP_DATABASE: + ret = pacman_database(pm_targets); + break; case PM_OP_REMOVE: ret = pacman_remove(pm_targets); break; diff --git a/src/pacman/pacman.h b/src/pacman/pacman.h index 97d0301..7c7801d 100644 --- a/src/pacman/pacman.h +++ b/src/pacman/pacman.h @@ -21,6 +21,8 @@ #include <alpm_list.h> +/* database.c */ +int pacman_database(alpm_list_t *targets); /* query.c */ int pacman_query(alpm_list_t *targets); /* remove.c */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 8056fbd..b7248d7 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -71,7 +71,7 @@ int trans_release(void) int needs_root(void) { - if(config->op == PM_OP_UPGRADE || config->op == PM_OP_REMOVE || /* -U, -R */ + if(config->op == PM_OP_UPGRADE || config->op == PM_OP_REMOVE || config->op == PM_OP_DATABASE || /* -U, -R, -D */ (config->op == PM_OP_SYNC && (config->op_s_clean || config->op_s_sync || /* -Sc, -Sy */ (!config->group && !config->op_s_info && !config->op_q_list /* all other -S combinations, where */ && !config->op_s_search && !config->op_s_printuris)))) { /* -g, -i, -l, -s, -p is not set */ -- 1.6.0.3

1 1

[pacman-dev] [PATCH 1/2] Don't print prompt with noconfirm
by Brendan Hide 20 May '09

20 May '09

Remove extraneous checks to config->noconfirm, shouldn't prompt user if noconfirm is set. Returns appropriate value immediately rather than later. Signed-off-by: Brendan Hide <brendan(a)swiftspirit.co.za> --- src/pacman/util.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index b80b09a..9f2c6b5 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -645,12 +645,12 @@ static int question(short preset, char *fmt, va_list args) FILE *stream; if(config->noconfirm) { - stream = stdout; - } else { - /* Use stderr so questions are always displayed when redirecting output */ - stream = stderr; + return(preset); } + /* Use stderr so questions are always displayed when redirecting output */ + stream = stderr; + vfprintf(stream, fmt, args); if(preset) { @@ -659,11 +659,6 @@ static int question(short preset, char *fmt, va_list args) fprintf(stream, " %s ", _("[y/N]")); } - if(config->noconfirm) { - fprintf(stream, "\n"); - return(preset); - } - if(fgets(response, 32, stdin)) { strtrim(response); if(strlen(response) == 0) { -- 1.6.3.1

1 0

[pacman-dev] noconfirm trivial bug - prompt printed but unused/unnecessary
by Brendan Hide 20 May '09

20 May '09

Hi all I'm still getting my head around git and pacman-dev's workflow - I know its not that complicated, just need a bit of time. When using --noconfirm the prompt is presented (odd part) and the user (rightly) is not given an opportunity to confirm: > [ brendan@swift : 12:36:40 : ~/src/pacman ] > :) sudo pacman -Sc --noconfirm > Cache directory: /var/cache/pacman/pkg/ > Do you want to remove outdated packages from cache? > [Y/n] <------ > removing old packages from cache... done. > Database directory: /var/lib/pacman/ > Do you want to remove unused repositories? [Y/n] <------ > Database directory cleaned up > [ brendan@swift : 12:36:57 : ~/src/pacman ] > :) Best fix I can think of is to just mention that we're using a default because the --noconfirm flag has been used. The alternative (which is less informative for the user) is to not present the prompt at all. I've inserted 2 strings below. Assuming this is the right change to make, what else would I need to do to ensure that this is compatible with the i18n measures already in place? util.c, lines 641-680: > /* presents a prompt and gets a Y/N answer */ > static int question(short preset, char *fmt, va_list args) > { > char response[32]; > FILE *stream; > > if(config->noconfirm) { > stream = stdout; > } else { > /* Use stderr so questions are always displayed when > redirecting output */ > stream = stderr; > } > > vfprintf(stream, fmt, args); > > if(preset) { > fprintf(stream, " %s ", _("[Y/n]")); > } else { > fprintf(stream, " %s ", _("[y/N]")); > } > > if(config->noconfirm) { > fprintf(stream, "\n"); Replace the 'fprintf(stream, "\n");' line above with something like: if(preset) { fprintf(stream, "%s", _("noconfirm option set, defaulting to Yes\n")); } else { fprintf(stream, "%s", _("noconfirm option set, defaulting to No\n")); } > return(preset); > } > > if(fgets(response, 32, stdin)) { > strtrim(response); > if(strlen(response) == 0) { > return(preset); > } > > if(!strcasecmp(response, _("Y")) || > !strcasecmp(response, _("YES"))) { > return(1); > } else if (!strcasecmp(response, _("N")) || > !strcasecmp(response, _("NO"))) { > return(0); > } > } > return(0); > } -- __________ Brendan Hide

3 4

Re: [pacman-dev] [arch-general] Marking a package as a dependency
by Xavier 20 May '09

20 May '09

On Wed, May 20, 2009 at 9:50 AM, Magnus Therning <magnus(a)therning.org> wrote: > I just recently bothered reading part of pacman's man page and found > that I probably should have performed a `pacman -U --asdeps > mypkg.tar.gz` as I installed dependencies for packages I build > manually. However I didn't, so can I retro-actively change the > reason-for-installation of an already installed package without > re-installing it? (No, I couldn't decipher whether the man page > already tells me how to do this :-) > See http://bugs.archlinux.org/task/12950 and http://bugs.archlinux.org/task/13964 especially Dan comment : You can always go and tweak the database file to change the reason if truly necessary. and Nagy comment : If someone suggest me good pacman switches, I will provide a patch for this. ;-) (I think we need a new main operation, -D/--database for example).

1 0

[pacman-dev] [PATCH] xdelta : only handle gz compression specifically
by Xavier 19 May '09

19 May '09

There is apparently no need to handle the re-compression manually when applying a xdelta patch in case of bzip2 or xz. Only gzip needs to be handled specifically for disabling timestamp with the -n option. After this patch, if xdelta is enhanced with xz support (1-line patch), it will be transparent from pacman side. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/sync.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) Note that this patch is completely untested :P diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index abda147..35e6fca 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -622,15 +622,12 @@ static int apply_deltas(pmtrans_t *trans) snprintf(to, len, "%s/%s", cachedir, d->to); /* build the patch command */ - /* compression command */ - char *compress = "cat"; if(endswith(to, ".gz")) { - compress = "gzip -n"; - } else if(endswith(to, ".bz2")) { - compress = "bzip"; + /* special handling for gzip : we disable timestamp with -n option */ + snprintf(command, PATH_MAX, "xdelta3 -d -q -R -c -s %s %s | gzip -n > %s", from, delta, to); + } else { + snprintf(command, PATH_MAX, "xdelta3 -d -q -s %s %s %s", from, delta, to); } - /* -R for disabling external recompression, -c for sending to stdout */ - snprintf(command, PATH_MAX, "xdelta3 -d -q -R -c -s %s %s | %s > %s", from, delta, compress, to); _alpm_log(PM_LOG_DEBUG, "command: %s\n", command); -- 1.6.3.1

1 1

[pacman-dev] [PATCH] Add support for the xz archive format
by Pierre Schmitz 19 May '09

19 May '09

This simple patch adds support for the xz archive format to makepkg and repo- add. Xz can be used as source, package and package db file type. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- scripts/makepkg.sh.in | 5 +++++ scripts/repo-add.sh.in | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d978107..cc59f1b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -648,6 +648,8 @@ extract_sources() { cmd="gunzip -d -f $file" ;; *application/x-bzip*) cmd="bunzip2 -f $file" ;; + *application/x-xz*) + cmd="xz -d -f $file" ;; *) # Don't know what to use to extract this file, # skip to the next file @@ -979,6 +981,7 @@ create_package() { case "$PKGEXT" in *tar.gz) EXT=${PKGEXT%.gz} ;; *tar.bz2) EXT=${PKGEXT%.bz2} ;; + *tar.xz) EXT=${PKGEXT%.xz} ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac @@ -996,6 +999,7 @@ create_package() { case "$PKGEXT" in *tar.gz) gzip -f -n "$pkg_file" ;; *tar.bz2) bzip2 -f "$pkg_file" ;; + *tar.xz) xz -z -f "$pkg_file" ;; esac ret=$? fi @@ -1054,6 +1058,7 @@ create_srcpackage() { case "$SRCEXT" in *tar.gz) TAR_OPT="z" ;; *tar.bz2) TAR_OPT="j" ;; + *tar.xz) TAR_OPT="J" ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$SRCEXT" ;; esac diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2390a92..bbd41a2 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -462,6 +462,7 @@ if [ $success -eq 1 ]; then case "$REPO_DB_FILE" in *tar.gz) TAR_OPT="z" ;; *tar.bz2) TAR_OPT="j" ;; + *tar.xz) TAR_OPT="J" ;; *) warning "$(gettext "'%s' does not have a valid archive extension.")" \ "$REPO_DB_FILE" ;; esac -- 1.6.3 -- 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

3 6