- Pacman-dev - lists.archlinux.org

[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 06 Sep '09

06 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 06 Sep '09

06 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 06 Sep '09

06 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 06 Sep '09

06 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

[pacman-dev] use of /usr/local with pacman
by Jeff 06 Sep '09

06 Sep '09

I just updated the installed pacman and noticed makepkg.conf's use of /usr/local in strip, doc, and man dirs. Should pacman allow any files to be installed into /usr/local? I've been an administrator on various UNIX clones for more than a decade and packages that were installed by the package manager, whether precompiled or a build recipe, always avoided /usr/local and any "local" modifications were put exclusively in /usr/local with PATH and library search path having /usr/local first so the user's modifications would take precedence. Just curious if pacman makes such a policy or if it is up to the PKGBUILD author. -- Jeff My other computer is an abacus.

3 4

[pacman-dev] Yum-presto like
by Matias Hernandez Arellano 05 Sep '09

05 Sep '09

It's posible to use or create something like yum-presto for pacman? -- Matias Hernández (Msdark) www.msdark.archlinux.cl ArchLinux-CL - WikiAdmin MSN: matiasfh(a)gmail.com Twitter : www.twitter.com/msdark Plurk : www.plurk.com/msdark Linux User: #445065 http://keys.gnupg.net/pks/lookup?op=get&search=0xEA3EEC672189419C

4 9

[pacman-dev] makechrootpkg and $PKGDEST
by bardo 05 Sep '09

05 Sep '09

Is it my impression or there are some problems with $SRCDEST and $PKGDEST? I didn't define any of these variables in both my makepkg.conf, the guest one and the chroot one. In makechrootpkg, lines 155-157, I see: --------- source $uniondir/etc/makepkg.conf [ -d "$uniondir/pkgdest" ] || mkdir "$uniondir/pkgdest" if ! grep "PKGDEST=/pkgdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then echo "Setting PKGDEST in makepkg.conf" echo "PKGDEST=/pkgdest" >> "$uniondir/etc/makepkg.conf" fi [ -d "$uniondir/srcdest" ] || mkdir "$uniondir/srcdest" if ! grep "SRCDEST=/srcdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then echo "Setting SRCDEST in makepkg.conf" echo "SRCDEST=/srcdest" >> "$uniondir/etc/makepkg.conf" fi --------- So here the chroot's makepkg.conf gets sourced, and it shouldn't inherit any of these variables, but they get forced (in the chroot) to /pkgdest and /srcdest. Problem is, later (lines 240-248) the files don't get moved to $WORKDIR as before, but they go to $PKGDEST, which *should* be empty (because it's the guest system's pkgdest, which got sourced before adding the variables there): --------- if [ -e $pkgfile ]; then if [ -n "$PKGDEST" ]; then echo "Moving completed ${_pkgname} package file to ${PKGDEST}" mv $pkgfile "${PKGDEST}" else echo "Moving completed ${_pkgname} package file to ${WORKDIR}" mv $pkgfile "${WORKDIR}" fi fi --------- I don't understand because they go the /{src,pkg}dest, but it looks like they shouldn't. Even more, there's no directory check on the guest system, so guess what... if the dirs don't exist, the source and dest files get renamed to /srcdest and /pkgdest respectively... This looks like a bug to me, but given how many times I am wrong (especially at 2 a.m.) I'd prefer to wait for some feedback before opening one. Corrado

3 3

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

04 Sep '09

On Fri, Sep 4, 2009 at 3:49 AM, Xyne<xyne(a)archlinux.ca> wrote: > On Thu, 3 Sep 2009 15:20:03 +0200 > Xavier <shiningxc(a)gmail.com> wrote: > >> I have a preliminary patch for this. I am not really happy with the C >> code I wrote for doing the substitutions, but it works. >> >> Does it make any sense to have this for -R and -U operations ? I >> implemented that but I don't really see any utility so I wanted to >> drop it. > > I think it makes sense for -R at the moment. It would also make sense > for -U if -U could handle dependency resolution. If you have working > code then I think you should just leave it in for now as it will be > good to have later. > >> Final concern : do you think this feature is useful when pacman asks >> questions and prints a lot of stuff before the actual output ? >> For many operations, the output is quite crap, and I don't know how to fix this. >> >> $ pacman -Rc --print gtk2 >> >> Remove (14): tango-icon-theme-0.8.1-1 midori-0.1.9-1 firefox-3.5.2-1 >> xulrunner-1.9.1.2-1 wireshark-1.2.1-1 mtr-0.75-4 >> libwebkit-1.1.10-2 libsoup-2.26.3-1 libunique-1.0.8-1 >> gconf-2.26.2-2 emacs-23.1-3 librsvg-2.26.0-1 audacious-2.1-1 >> gtk2-2.16.5-1 >> >> Total Removed Size: 279.73 MB >> >> Do you want to remove these packages? [Y/n] >> tango-icon-theme 0.8.1-1 >> midori 0.1.9-1 >> firefox 3.5.2-1 >> xulrunner 1.9.1.2-1 >> >> $ pacman -S --print base >> base package not found, searching for group... >> :: group base (including ignored packages): >> acl attr bash binutils bzip2 coreutils cpio cracklib >> cryptsetup dash db dbus-core dcron device-mapper dhcpcd dialog >> diffutils e2fsprogs file filesystem findutils gawk gcc-libs >> gdbm gen-init-cpio gettext glibc grep groff grub gzip hdparm >> initscripts iputils jfsutils kbd kernel-headers kernel26 >> kernel26-firmware klibc klibc-extras klibc-kbd >> klibc-module-init-tools klibc-udev less libarchive libfetch >> libgcrypt libgpg-error libpcap libusb licenses logrotate lvm2 >> lzo2 mailx man-db man-pages mdadm mkinitcpio mlocate >> module-init-tools nano ncurses net-tools pacman pacman-mirrorlist >> pam pciutils pcmciautils pcre perl popt ppp procinfo procps >> psmisc readline reiserfsprogs rp-pppoe sdparm sed shadow >> sysfsutils syslog-ng sysvinit tar tcp_wrappers texinfo tzdata >> udev usbutils util-linux-ng vi wget which wpa_supplicant >> xfsprogs zlib >> :: Install whole content? [Y/n] >> kernel-headers 2.6.30.5-1 >> tzdata 2009l-1 >> glibc 2.10.1-4 >> attr 2.4.43-1 >> acl 2.2.47-2 >> ncurses 5.7-2 > > > Hmmmm... that's a good point. It might seem superfluous but I think > it's good to keep that. It would enable scripts to handle the dialogue > through a pipe and then easily parse the output so I see a utility in > it. It would probably be less useful for the user directly though, but > even then it would be interesting for some dialogues to see which > dependencies some of the group members will pull in (or cascadingly > remove). Consider the DE groups for example. They should pull in other > packages that are not part of the group dialogue. > > That does not go well with my idea that print operations should imply noconfirm though (see attached patch and commit log). I guess this requires further thinking and discussion. I also forgot to mention that I don't like the group interactivity , but that is another problem.

1 0