September 2009 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.0-52-g19e07eb
by dan＠archlinux.org 09 Sep '09

09 Sep '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 19e07eb8e84dd117061a600abdd9c8fed7391a07 (commit) via 8ff3b87066d35d3518a3cd0bef27b86c3a85e983 (commit) via 0da96abc900560f21c643b255c94a60232f4a24b (commit) via b7db46d610efd5f71d5e4e887fed7a3fd3b3dd86 (commit) via 90e3e026d1236ad89c142b427d7eeb842bbb7ff4 (commit) via 12b55958d8884bd6828e0888ab9dc10d38bcd72f (commit) via 902dfe5900c89461e76f03a3429a867cc93fd418 (commit) via f53d9bab0ef28f2417abb10d1dff4867bf06b8ea (commit) from cd5b029e934476e8ea6dade5798bfa3d6b6ceafd (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 19e07eb8e84dd117061a600abdd9c8fed7391a07 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Sep 1 00:25:56 2009 +0200 Re-enable REMOVE_PKGS test in pactest suite With the help of --ask switch it is possible to test remove_unresolvable feature, so I reverted the change of commit f2061c5f on ignore005.py with --ask=32 added. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8ff3b87066d35d3518a3cd0bef27b86c3a85e983 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Jul 15 19:14:01 2009 +0200 Remove transaction type This basically started with this change : /* Transaction */ struct __pmtrans_t { - pmtranstype_t type; pmtransflag_t flags; pmtransstate_t state; - alpm_list_t *packages; /* list of (pmpkg_t *) */ + alpm_list_t *add; /* list of (pmpkg_t *) */ + alpm_list_t *remove; /* list of (pmpkg_t *) */ And then I have to modify all the code accordingly. commit 0da96abc900560f21c643b255c94a60232f4a24b Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jun 9 17:23:46 2009 +0200 Use sync.c for upgrade transaction prepare and commit This patch utilizes the power of sync.c to fix FS#3492 and FS#5798. Now an upgrade transaction is just a sync transaction internally (in alpm), so all sync features are available with -U as well: * conflict resolving * sync dependencies from sync repos * remove unresolvable targets See http://www.archlinux.org/pipermail/pacman-dev/2009-June/008725.html for the concept. We use "mixed" target list, where PKG_FROM_FILE origin indicates local package file, PKG_FROM_CACHE indicates sync package. The front-end can add only one type of packages (depending on transaction type) atm, but if alpm resolves dependencies for -U, we may get a real mixed trans->packages list. _alpm_pkg_free_trans() was modified so that it can handle both target types _alpm_add_prepare() was removed, we use _alpm_sync_prepare() instead _alpm_add_commit() was renamed to _alpm_upgrade_targets() sync.c (and deps.c) was modified slightly to handle mixed target lists, the modifications are straightforward. There is one notable change here: We don't create new upgrade trans in sync.c, we replace the pkgcache entries with the loaded package files in the target list (this is a bit hackish) and call _alpm_upgrade_targets(). This implies a TODO (pkg->origin_data.db is not accessible anymore), but it doesn't hurt anything with pacman front-end, so it will be fixed later (otherwise this patch would be huge). I updated the documentation of -U and I added a new pactest, upgrade090.py, to test the syncdeps feature of -U. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b7db46d610efd5f71d5e4e887fed7a3fd3b3dd86 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon Aug 31 23:54:51 2009 +0200 Do not remove conflict by default When a conflict is detected, pacman asks if the user wants to remove the conflicting package. In many cases this is a bad idea. e.g. udev conflicts with initscripts (initscripts<2009.07). Remove initscripts [Y/n] This changes the query to [y/N]. The --noconfirm behavior has been also changed, because it chooses the default answer. Since the yes answer is more interesting in our pactests dealing with conflicts, I inserted '--ask=4' to all of them with one exception: sync042.py tests the no answer. (I also fixed a typo in sync043.py) Original-work-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> commit 90e3e026d1236ad89c142b427d7eeb842bbb7ff4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Aug 31 20:17:05 2009 +0200 Re-add the non-user friendly --ask option This re-implements the --ask option which was removed in commit 1ff8e7f364a9f640ada7526384646d510ac29967. This option does not have to be exposed to the user (help,doc,etc), but is very very useful for pactest if we want to have more coverage there. This was rewritten in a smarter way, without code duplication. And with a different behavior : this option is now only used to inverse default behavior to questions. We still use bit operations based on the following struct : /* Transaction Conversations (ie, questions) */ typedef enum _pmtransconv_t { PM_TRANS_CONV_INSTALL_IGNOREPKG = 0x01, PM_TRANS_CONV_REPLACE_PKG = 0x02, PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, PM_TRANS_CONV_LOCAL_NEWER = 0x10, PM_TRANS_CONV_REMOVE_PKGS = 0x20, } pmtransconv_t; for each conv matched, the default answer is inversed. --ask 0 : all default answers are preserved --ask 4 : only conflict question is inversed --ask 63 : all questions are inversed (63 == 1+2+4+8+16+32) Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 12b55958d8884bd6828e0888ab9dc10d38bcd72f Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon Aug 31 16:20:18 2009 +0200 Add a new reason field to pmconflict_t struct Sometimes "foo conflicts with bar" information is not enough, see this thread: http://bbs.archlinux.org/viewtopic.php?id=77647. That's why I added a new reason field to our pmconflict_t struct that stores the packager- defined conflict that induced the fact that package1 conflicts with package2. I modified the front-end (in callback.c, sync.c, upgrade.c) to print this new information as well. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> commit 902dfe5900c89461e76f03a3429a867cc93fd418 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon Jul 27 14:21:26 2009 +0200 Change Y/n to y/N with REMOVE_PKGS (remove_unresolvable) callback The main reason for this change is that scripts could not catch the removed targets with -S --noconfirm (the return value was 0). So the effect of a pacman command may have differed from the expected one. Moreover, for my taste the default no answer is better (I wanted to install the specified targets, not a subset of them). I had to change some pactest files as well, because now the default behavior is not to remove unresolvable targets. In fact, the only pactest file that tested this feature was ignore005.py. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f53d9bab0ef28f2417abb10d1dff4867bf06b8ea Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Sep 7 20:58:49 2009 +0200 Allow '-Su foo' operation This implements FS#15581 '-Su foo' should be more or less equivalent do '-Su ; -S foo' Note : I moved a block of code to a new process_target function 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 | 7 +- lib/libalpm/add.c | 187 +-------------- lib/libalpm/add.h | 3 +- lib/libalpm/alpm.h | 19 +- lib/libalpm/be_files.c | 3 +- lib/libalpm/conflict.c | 26 ++- lib/libalpm/conflict.h | 3 +- lib/libalpm/deps.c | 2 +- lib/libalpm/package.c | 18 +- lib/libalpm/remove.c | 174 +++++++++------ lib/libalpm/remove.h | 5 +- lib/libalpm/sync.c | 176 ++++++--------- lib/libalpm/trans.c | 381 ++++++++++++++---------------- lib/libalpm/trans.h | 9 +- pactest/tests/depconflict110.py | 8 +- pactest/tests/ignore002.py | 2 +- pactest/tests/ignore003.py | 2 +- pactest/tests/ignore004.py | 2 +- pactest/tests/ignore005.py | 2 +- pactest/tests/provision020.py | 2 +- pactest/tests/provision022.py | 2 +- pactest/tests/sync042.py | 6 +- pactest/tests/sync043.py | 6 +- pactest/tests/sync044.py | 2 +- pactest/tests/sync1004.py | 2 +- pactest/tests/sync1008.py | 2 +- pactest/tests/{sync110.py => sync150.py} | 9 +- pactest/tests/sync300.py | 2 +- pactest/tests/sync890.py | 2 +- pactest/tests/sync892.py | 2 +- pactest/tests/sync893.py | 2 +- pactest/tests/sync895.py | 2 +- pactest/tests/sync896.py | 2 +- pactest/tests/sync897.py | 2 +- pactest/tests/sync899.py | 2 +- pactest/tests/sync900.py | 2 +- pactest/tests/sync901.py | 2 +- pactest/tests/sync992.py | 2 +- pactest/tests/sync999.py | 2 +- pactest/tests/upgrade051.py | 4 +- pactest/tests/upgrade090.py | 28 +++ src/pacman/callback.c | 26 ++- src/pacman/conf.h | 2 + src/pacman/pacman.c | 7 + src/pacman/remove.c | 10 +- src/pacman/sync.c | 159 +++++++------ src/pacman/upgrade.c | 76 +++++-- src/pacman/util.c | 35 +--- src/pacman/util.h | 3 +- 49 files changed, 655 insertions(+), 779 deletions(-) copy pactest/tests/{sync110.py => sync150.py} (68%) create mode 100644 pactest/tests/upgrade090.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] '-Spp and -Supp' options were added to generate uri list without the downloaded package uris
by Laszlo Papp 09 Sep '09

09 Sep '09

Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- src/pacman/pacman.c | 2 +- src/pacman/sync.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 25647b5..00b14f5 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -485,7 +485,7 @@ static int parseargs(int argc, char *argv[]) case 'o': config->op_q_owns = 1; break; case 'p': config->op_q_isfile = 1; - config->op_s_printuris = 1; + config->op_s_printuris++; config->flags |= PM_TRANS_FLAG_NOCONFLICTS; config->flags |= PM_TRANS_FLAG_NOLOCK; break; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index dc93621..b4e2eac 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -678,6 +678,9 @@ static int sync_trans(alpm_list_t *targets) pmpkg_t *pkg = alpm_list_getdata(i); pmdb_t *db = alpm_pkg_get_db(pkg); const char *dburl = alpm_db_get_url(db); + if ((config->op_s_printuris >= 2) && !alpm_pkg_download_size(pkg)) { + continue; + } if(dburl) { printf("%s/%s\n", dburl, alpm_pkg_get_filename(pkg)); } else { -- 1.6.4.1

4 23

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-20-g2e7c569
by dan＠archlinux.org 08 Sep '09

08 Sep '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 2e7c569950f3a6f651fb4850cb320068e2261198 (commit) via 814cd7aee1f526479a24b62b01b24e25cd656d2b (commit) from f53d2ac471a28e65e765a85251ba4cb6cf67cdbb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD.vim | 2 +- doc/PKGBUILD.5.txt | 3 ++- doc/makepkg.8.txt | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.0-44-gcd5b029
by dan＠archlinux.org 08 Sep '09

08 Sep '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 cd5b029e934476e8ea6dade5798bfa3d6b6ceafd (commit) via 43e16b373be50ca142e2b39055906194049c3686 (commit) via cb1d4195bf7436240dbcc865113f3be19354aa34 (commit) via 2e7c569950f3a6f651fb4850cb320068e2261198 (commit) via 814cd7aee1f526479a24b62b01b24e25cd656d2b (commit) via 2f190726324c44f314e8966f0068dea0b013d968 (commit) via 845f21207c53c36c02f14343dcf4dbbca5462ce0 (commit) via f53d2ac471a28e65e765a85251ba4cb6cf67cdbb (commit) from 0845b2f13cef6db23a4a281976ec1374e93b7c4e (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 cd5b029e934476e8ea6dade5798bfa3d6b6ceafd Merge: 43e16b373be50ca142e2b39055906194049c3686 2e7c569950f3a6f651fb4850cb320068e2261198 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Sep 7 15:17:47 2009 -0500 Merge branch 'maint' commit 43e16b373be50ca142e2b39055906194049c3686 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Sep 7 01:15:39 2009 +0200 rewrite strreplace * just do one malloc call * p = realloc(p, new_size) was not good (see http://www.iso-9899.info/wiki/Why_not_realloc) * use more efficient strncpy instead of strncat Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cb1d4195bf7436240dbcc865113f3be19354aa34 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Sep 7 01:14:09 2009 +0200 use strreplace in the xfercommand code this operation was re-implemented using static strings, instead of using the existing strreplace function Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2f190726324c44f314e8966f0068dea0b013d968 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Sep 7 01:50:36 2009 +0200 fix small memleak in an error case Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 845f21207c53c36c02f14343dcf4dbbca5462ce0 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Sep 7 01:13:24 2009 +0200 libalpm/util.c : remove _alpm_strreplace This function is unused since commit 358cc5804a2df873180e6d9ef2420ab3247f8437. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Dan: also kill from util.h] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD.vim | 2 +- doc/PKGBUILD.5.txt | 3 +- doc/index.txt | 1 + doc/makepkg.8.txt | 3 +- lib/libalpm/util.c | 45 --------------------------- lib/libalpm/util.h | 1 - src/pacman/pacman.c | 36 ++++++++-------------- src/pacman/util.c | 81 ++++++++++++++++++++++++++++++------------------- 8 files changed, 68 insertions(+), 104 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Allow '-Su foo' operation
by Xavier Chantry 07 Sep '09

07 Sep '09

This implements FS#15581 '-Su foo' should be more or less equivalent do '-Su ; -S foo' Note : I moved a block of code to a new process_target function Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- doc/pacman.8.txt | 4 +- pactest/tests/sync150.py | 25 +++++++++ src/pacman/sync.c | 135 ++++++++++++++++++++++++---------------------- 3 files changed, 99 insertions(+), 65 deletions(-) create mode 100644 pactest/tests/sync150.py diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index a534e05..559b45d 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -332,7 +332,9 @@ linkman:pacman.conf[5]. necessary. Pass this option twice to enable package downgrade; in this case pacman will select sync packages whose version does not match with the local version. This can be useful when the user switches from a testing - repo to a stable one. + repo to a stable one. Additional targets can also be specified manually, so + that '-Su foo' will do a system upgrade and install/upgrade the foo package in + the same operation. *-w, \--downloadonly*:: Retrieve all packages from the server, but do not install/upgrade diff --git a/pactest/tests/sync150.py b/pactest/tests/sync150.py new file mode 100644 index 0000000..b62bd98 --- /dev/null +++ b/pactest/tests/sync150.py @@ -0,0 +1,25 @@ +self.description = "-Su foo" + +sp1 = pmpkg("pkg1", "1.0-2") +sp1.depends = ["pkg2"] + +sp2 = pmpkg("pkg2") +sp2.depends = ["pkg3"] + +sp3 = pmpkg("pkg3") + +sp4 = pmpkg("pkg4") + +for p in sp1, sp2, sp3, sp4: + self.addpkg2db("sync", p) + +lp1 = pmpkg("pkg1") +self.addpkg2db("local", lp1) + +self.args = "-Su %s" % sp4.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +for p in sp2, sp3: + self.addrule("PKG_REASON=%s|1" % p.name) +self.addrule("PKG_REASON=%s|0" % sp4.name) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f101f9..58f6047 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -548,18 +548,88 @@ static alpm_list_t *syncfirst() { return(res); } +static int process_target(char *targ, alpm_list_t *targets) +{ + alpm_list_t *sync_dbs = alpm_option_get_syncdbs(); + + if(alpm_trans_addtarget(targ) == -1) { + pmgrp_t *grp = NULL; + int found = 0; + alpm_list_t *j; + + if(pm_errno == PM_ERR_TRANS_DUP_TARGET || pm_errno == PM_ERR_PKG_IGNORED) { + /* just skip duplicate or ignored targets */ + pm_printf(PM_LOG_WARNING, _("skipping target: %s\n"), targ); + return(0); + } + if(pm_errno != PM_ERR_PKG_NOT_FOUND) { + pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", + targ, alpm_strerrorlast()); + return(1); + } + /* target not found: check if it's a group */ + printf(_("%s package not found, searching for group...\n"), targ); + for(j = sync_dbs; j; j = alpm_list_next(j)) { + pmdb_t *db = alpm_list_getdata(j); + grp = alpm_db_readgrp(db, targ); + if(grp) { + alpm_list_t *k, *pkgnames = NULL; + + found++; + printf(_(":: group %s (including ignored packages):\n"), targ); + /* remove dupe entries in case a package exists in multiple repos */ + alpm_list_t *grppkgs = alpm_grp_get_pkgs(grp); + alpm_list_t *pkgs = alpm_list_remove_dupes(grppkgs); + for(k = pkgs; k; k = alpm_list_next(k)) { + pkgnames = alpm_list_add(pkgnames, + (char*)alpm_pkg_get_name(k->data)); + } + list_display(" ", pkgnames); + if(yesno(_(":: Install whole content?"))) { + for(k = pkgnames; k; k = alpm_list_next(k)) { + targets = alpm_list_add(targets, strdup(alpm_list_getdata(k))); + } + } else { + for(k = pkgnames; k; k = alpm_list_next(k)) { + char *pkgname = alpm_list_getdata(k); + if(yesno(_(":: Install %s from group %s?"), pkgname, targ)) { + targets = alpm_list_add(targets, strdup(pkgname)); + } + } + } + alpm_list_free(pkgnames); + alpm_list_free(pkgs); + } + } + if(!found) { + pm_fprintf(stderr, PM_LOG_ERROR, _("'%s': not found in sync db\n"), targ); + return(1); + } + } + return(0); +} + static int sync_trans(alpm_list_t *targets) { int retval = 0; alpm_list_t *data = NULL; - alpm_list_t *sync_dbs = alpm_option_get_syncdbs(); alpm_list_t *packages = NULL; + alpm_list_t *i; /* Step 1: create a new transaction... */ if(trans_init(PM_TRANS_TYPE_SYNC, config->flags) == -1) { return(1); } + /* process targets */ + for(i = targets; i; i = alpm_list_next(i)) { + char *targ = alpm_list_getdata(i); + if(process_target(targ, targets) == 1) { + retval = 1; + goto cleanup; + } + } + if(config->op_s_upgrade) { printf(_(":: Starting full system upgrade...\n")); alpm_logaction("starting full system upgrade\n"); @@ -568,69 +638,6 @@ static int sync_trans(alpm_list_t *targets) retval = 1; goto cleanup; } - } else { - alpm_list_t *i; - - /* process targets */ - for(i = targets; i; i = alpm_list_next(i)) { - char *targ = alpm_list_getdata(i); - if(alpm_trans_addtarget(targ) == -1) { - pmgrp_t *grp = NULL; - int found = 0; - alpm_list_t *j; - - if(pm_errno == PM_ERR_TRANS_DUP_TARGET || pm_errno == PM_ERR_PKG_IGNORED) { - /* just skip duplicate or ignored targets */ - pm_printf(PM_LOG_WARNING, _("skipping target: %s\n"), targ); - continue; - } - if(pm_errno != PM_ERR_PKG_NOT_FOUND) { - pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", - targ, alpm_strerrorlast()); - retval = 1; - goto cleanup; - } - /* target not found: check if it's a group */ - printf(_("%s package not found, searching for group...\n"), targ); - for(j = sync_dbs; j; j = alpm_list_next(j)) { - pmdb_t *db = alpm_list_getdata(j); - grp = alpm_db_readgrp(db, targ); - if(grp) { - alpm_list_t *k, *pkgnames = NULL; - - found++; - printf(_(":: group %s (including ignored packages):\n"), targ); - /* remove dupe entries in case a package exists in multiple repos */ - alpm_list_t *grppkgs = alpm_grp_get_pkgs(grp); - alpm_list_t *pkgs = alpm_list_remove_dupes(grppkgs); - for(k = pkgs; k; k = alpm_list_next(k)) { - pkgnames = alpm_list_add(pkgnames, - (char*)alpm_pkg_get_name(k->data)); - } - list_display(" ", pkgnames); - if(yesno(_(":: Install whole content?"))) { - for(k = pkgnames; k; k = alpm_list_next(k)) { - targets = alpm_list_add(targets, strdup(alpm_list_getdata(k))); - } - } else { - for(k = pkgnames; k; k = alpm_list_next(k)) { - char *pkgname = alpm_list_getdata(k); - if(yesno(_(":: Install %s from group %s?"), pkgname, targ)) { - targets = alpm_list_add(targets, strdup(pkgname)); - } - } - } - alpm_list_free(pkgnames); - alpm_list_free(pkgs); - } - } - if(!found) { - pm_fprintf(stderr, PM_LOG_ERROR, _("'%s': not found in sync db\n"), targ); - retval = 1; - goto cleanup; - } - } - } } /* Step 2: "compute" the transaction based on targets and flags */ -- 1.6.4.2

1 0

[pacman-dev] [PATCH] rewrite strreplace
by Xavier Chantry 07 Sep '09

07 Sep '09

* just do one malloc call * p = realloc(p, new_size) was not good (see http://www.iso-9899.info/wiki/Why_not_realloc) * use more efficient strncpy instead of strncat Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/pacman/util.c | 75 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 31 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 6af8229..d137460 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -335,48 +335,61 @@ char *strtrim(char *str) return(str); } -/* Helper function for strreplace */ -static void _strnadd(char **str, const char *append, unsigned int count) -{ - if(*str) { - *str = realloc(*str, strlen(*str) + count + 1); - } else { - *str = calloc(sizeof(char), count + 1); - } - - strncat(*str, append, count); -} - /* Replace all occurances of 'needle' with 'replace' in 'str', returning * a new string (must be free'd) */ char *strreplace(const char *str, const char *needle, const char *replace) { - const char *p, *q; - p = q = str; - - char *newstr = NULL; + const char *p = NULL, *q = NULL; + char *newstr = NULL, *newp = NULL; + alpm_list_t *i = NULL, *list = NULL; unsigned int needlesz = strlen(needle), replacesz = strlen(replace); - while (1) { + if(!str) { + return(NULL); + } + + p = str; + q = strstr(p, needle); + while(q) { + list = alpm_list_add(list, (char *)q); + p = q + needlesz; q = strstr(p, needle); - if(!q) { /* not found */ - if(*p) { - /* add the rest of 'p' */ - _strnadd(&newstr, p, strlen(p)); - } - break; - } else { /* found match */ - if(q > p){ - /* add chars between this occurance and last occurance, if any */ - _strnadd(&newstr, p, q - p); - } - _strnadd(&newstr, replace, replacesz); - p = q + needlesz; + } + + if(!list) { + return(strdup(str)); + } + newstr = malloc(strlen(str) + 1 + + alpm_list_count(list) * (replacesz - needlesz)); + if(!newstr) { + return(NULL); + } + *newstr = 0; + + p = str; + newp = newstr; + for(i = list; i; i = alpm_list_next(i)) { + q = alpm_list_getdata(i); + if(q > p){ + /* add chars between this occurance and last occurance, if any */ + strncpy(newp, p, q - p); + newp += q - p; } + strncpy(newp, replace, replacesz); + newp += replacesz; + p = q + needlesz; + } + alpm_list_free(list); + + if(*p) { + /* add the rest of 'p' */ + strcpy(newp, p); + newp += strlen(p); } + *newp = 0; - return newstr; + return(newstr); } /** Splits a string into a list of strings using the chosen character as -- 1.6.4.2

3 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.0-36-g0845b2f
by dan＠archlinux.org 07 Sep '09

07 Sep '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 0845b2f13cef6db23a4a281976ec1374e93b7c4e (commit) via 5dbd00faf7a27866ffc2a7197c5cc704425a7af8 (commit) from c88ac86292a9cd9b87ab9ebf203b9eca75af1f28 (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 0845b2f13cef6db23a4a281976ec1374e93b7c4e Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 30 22:05:46 2009 +0200 sanity check for optdepends syntax only allow optdepends like: pkgname: description some (real) examples of invalid optdepends: 'tcl, python and/or ruby: to use corresponding binding' 'xorg-fonts-75dpi : X bitmap fonts needed for the interface' 'ruby-htmlentities (AUR): for one provider named Deastore' 'xpdf - for pdf' Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Allan: rebase off de39a1f6 and adjust man page] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5dbd00faf7a27866ffc2a7197c5cc704425a7af8 Author: Oleg Finkelshteyn <olegfink(a)gmail.com> Date: Thu Aug 27 00:11:41 2009 +0200 Don't wrap lines when we don't have a column size For example when we are not in a tty, there is no point in wrapping the output. This actually makes the job harder for scripts. $ pacman -Si binutils | grep Desc Description : A set of programs to assemble and manipulate binary and The description was cut because the rest was on the following line. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Dan: use printf everywhere] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 2 +- scripts/makepkg.sh.in | 8 ++++++++ src/pacman/util.c | 49 ++++++++++++++++++++----------------------------- 3 files changed, 29 insertions(+), 30 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-18-gf53d2ac
by dan＠archlinux.org 07 Sep '09

07 Sep '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via f53d2ac471a28e65e765a85251ba4cb6cf67cdbb (commit) via 1e51b81c6392125899c94761b5aa35bb6a0e032c (commit) from 7ddb645bd7cf7e1c56a508321df511864da411a4 (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 f53d2ac471a28e65e765a85251ba4cb6cf67cdbb Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 6 16:13:40 2009 -0500 Add 3.3.0 release to index.txt ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 1 + scripts/makepkg.sh.in | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.0-34-gc88ac86
by dan＠archlinux.org 07 Sep '09

07 Sep '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 c88ac86292a9cd9b87ab9ebf203b9eca75af1f28 (commit) via 6e1b1aea5908fba6669b31a0a92f934a6a2aa244 (commit) via b53aa87ea9489f15c42c5213569be0b73789b77f (commit) via cb07265851898ae352ef801ef99c98f26e28b03e (commit) via 545eac145d77c66714ec88a88056ac3827c9b240 (commit) via b9dd8ce2334daea7e3949370c17c64e973b7c6db (commit) via 65c1f06be5a9c4bdb197b61563da7c2e28162392 (commit) via 5b27e78ba015a48baf2d3c8687fdf3084781f9c9 (commit) via 594621cbeb2f27ce8d36e652c4fdd9a9d4385ec3 (commit) via 1e51b81c6392125899c94761b5aa35bb6a0e032c (commit) via 7ddb645bd7cf7e1c56a508321df511864da411a4 (commit) via a05757f984f526233e90a774beb571dba8270ff0 (commit) via 20ba3cfe4e92beab9ae368bf73c1609f2555ee9a (commit) via 82522dd8c1f4cd9f19d0cae83368689971f48ebd (commit) from 92f0775e76c75ebe9e30355cc99bb40cf365abcb (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 c88ac86292a9cd9b87ab9ebf203b9eca75af1f28 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Dec 20 06:51:59 2008 +0100 Log commandline in pacman/alpm log This implements FS#11452. Original-work-by: silvio <silvio(a)port1024.net> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6e1b1aea5908fba6669b31a0a92f934a6a2aa244 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Sep 6 23:01:55 2009 +0200 Add pactest for 'any' architecture Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b53aa87ea9489f15c42c5213569be0b73789b77f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Aug 18 20:30:04 2009 +0200 makepkg : check for invalid backup entry This implements FS#13551 Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cb07265851898ae352ef801ef99c98f26e28b03e Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Aug 25 00:19:20 2009 +0200 makepkg : refactor run_build and run_package These two functions were very similar. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 545eac145d77c66714ec88a88056ac3827c9b240 Author: Henning Garus <henning.garus(a)googlemail.com> Date: Sun Aug 23 17:16:21 2009 +0200 makepkg: exit on error during build() or package() Set the ERR trap to abort upon encountering an error during the execution of a build or package function. Activate set -E, which lets functions inherit the ERR trap. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b9dd8ce2334daea7e3949370c17c64e973b7c6db Merge: 65c1f06be5a9c4bdb197b61563da7c2e28162392 1e51b81c6392125899c94761b5aa35bb6a0e032c Author: Dan McGee <dan(a)archlinux.org> Date: Sun Sep 6 15:54:11 2009 -0500 Merge branch 'maint' commit 65c1f06be5a9c4bdb197b61563da7c2e28162392 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 19 18:35:32 2009 +0200 Allow $arch to be used in Server similarly to the $repo variable, Server can now contain $arch, which will be automatically replaced by the appropriate architecture. This allows us to have one universal mirrorlist file, for both i686 and x86_64, woohoo! Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5b27e78ba015a48baf2d3c8687fdf3084781f9c9 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 19 17:58:03 2009 +0200 Check package arch before installing This implements FS#15622 Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 594621cbeb2f27ce8d36e652c4fdd9a9d4385ec3 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Jul 21 23:03:25 2009 -0500 Add Architecture and --arch option Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 + doc/makepkg.8.txt | 4 + doc/pacman.8.txt | 2 + doc/pacman.conf.5.txt | 14 ++- etc/pacman.conf.in | 4 +- lib/libalpm/alpm.h | 4 + lib/libalpm/error.c | 2 + lib/libalpm/handle.c | 16 ++ lib/libalpm/handle.h | 1 + lib/libalpm/trans.c | 33 ++++ pactest/tests/{upgrade004.py => upgrade080.py} | 6 +- pactest/tests/{upgrade071.py => upgrade081.py} | 6 +- pactest/tests/{upgrade072.py => upgrade082.py} | 12 +- pactest/tests/{upgrade071.py => upgrade083.py} | 9 +- pactest/tests/{upgrade004.py => upgrade084.py} | 6 +- po/ru.po | 111 +++++++------- scripts/makepkg.sh.in | 199 ++++++++++++++---------- scripts/rankmirrors.py.in | 2 + src/pacman/pacman.c | 67 ++++++++- src/pacman/remove.c | 6 + src/pacman/sync.c | 6 + src/pacman/upgrade.c | 6 + 22 files changed, 366 insertions(+), 155 deletions(-) copy pactest/tests/{upgrade004.py => upgrade080.py} (57%) copy pactest/tests/{upgrade071.py => upgrade081.py} (66%) copy pactest/tests/{upgrade072.py => upgrade082.py} (52%) copy pactest/tests/{upgrade071.py => upgrade083.py} (60%) copy pactest/tests/{upgrade004.py => upgrade084.py} (59%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.0-16-g7ddb645
by dan＠archlinux.org 07 Sep '09

07 Sep '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 7ddb645bd7cf7e1c56a508321df511864da411a4 (commit) via a05757f984f526233e90a774beb571dba8270ff0 (commit) via 20ba3cfe4e92beab9ae368bf73c1609f2555ee9a (commit) via 82522dd8c1f4cd9f19d0cae83368689971f48ebd (commit) from bdd8e92ff601aab44941e7572f6c48d7e32a3f24 (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 7ddb645bd7cf7e1c56a508321df511864da411a4 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 5 16:12:46 2009 +0200 makepkg: always keep sources symlinks Make bunzip2/xz/gunzip decompressing to stdout, because gzip does not offer something like a -k option. The selection of the decompression command for gzip/bzip2/xz compressed files now also depends on the file suffix, since we need to strip the extensions to get the output filename. Thanks to Cedric Staniewski <cedric(a)gmx.ca> for reporting this issue and contributing patches. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a05757f984f526233e90a774beb571dba8270ff0 Author: Henning Garus <henning.garus(a)googlemail.com> Date: Mon Aug 24 22:10:47 2009 +0200 Configure: Check if libfetch version is >= 2.21 Commit 6f97842 started using libfetch's conditional GET. This requires libfetch to be version 2.21 or greater. Change configure.ac to check for the existence of the last_modified field in the url struct, which was introduced with libfetch 2.21. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> [Xav : moved AC_CHECK_MEMBER outside of AC_CHECK_LIB] Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20ba3cfe4e92beab9ae368bf73c1609f2555ee9a Author: Sergey Tereschenko <serg.partizan(a)gmail.com> Date: Wed Aug 19 22:48:17 2009 +0200 update russian translation Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 82522dd8c1f4cd9f19d0cae83368689971f48ebd Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Aug 10 15:50:53 2009 +0200 makepkg: new --skipinteg option Implements FS#15830 This option allows to build a PKGBUILD with no checksums Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 ++ doc/makepkg.8.txt | 4 ++ po/ru.po | 111 +++++++++++++++++++++++++------------------------ scripts/makepkg.sh.in | 42 ++++++++++++++---- 4 files changed, 97 insertions(+), 65 deletions(-) hooks/post-receive -- The official pacman repository

1 0