- Pacman-dev - lists.archlinux.org

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

13 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 f250b034b407d45bb08c7b713b01d25e0bb2b6ee (commit) via ef500b44ce45255da16e18b8e9aa4d43fab359b8 (commit) via 04d5c4294ab5d35cceb149d7c94a4bf3aa6d7a85 (commit) from aa579b843899ccba093f83faa942599ce1110c24 (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 f250b034b407d45bb08c7b713b01d25e0bb2b6ee Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Jun 10 20:22:04 2009 +0200 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> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ef500b44ce45255da16e18b8e9aa4d43fab359b8 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jun 9 14:11:15 2009 +1000 makepkg: fix variable backup/restore for splitpkg 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> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 04d5c4294ab5d35cceb149d7c94a4bf3aa6d7a85 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jun 13 23:54:23 2009 +1000 makepkg: fix PKGBUILD sanity check 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> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/sync.c | 1 + scripts/makepkg.sh.in | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[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