- Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC][PATCH] Introduce Include key globing for pacman.conf
by Marc - A. Dahlhaus 24 Mar '10

24 Mar '10

This patch adds the ability to use Include filenames containing wildcards and also expands the tilde to the homedirectory of the executing user. Signed-off-by: Marc-A. Dahlhaus <mad(a)wol.de> --- diff -Nurp pacman-3.3.0.orig/src/pacman/pacman.c pacman-3.3.0/src/pacman/pacman.c --- pacman-3.3.0.orig/src/pacman/pacman.c 2009-08-01 20:07:42.000000000 +0200 +++ pacman-3.3.0/src/pacman/pacman.c 2009-09-10 21:11:03.000000000 +0200 @@ -38,6 +38,7 @@ #include <locale.h> /* setlocale */ #include <time.h> /* time_t */ #include <errno.h> +#include <glob.h> #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) #include <mcheck.h> /* debug tracing (mtrace) */ #endif @@ -814,8 +815,23 @@ static int _parseconfig(const char *file } else { /* directives with settings */ if(strcmp(key, "Include") == 0) { - pm_printf(PM_LOG_DEBUG, "config: including %s\n", ptr); - _parseconfig(ptr, section, db); + int globret; + glob_t globbuf; + globret = glob(ptr, GLOB_TILDE_CHECK, NULL, &globbuf); + switch(globret) { + case GLOB_NOSPACE: + pm_printf(PM_LOG_DEBUG, "config: include globing out of space\n"); + break; + case GLOB_ABORTED: + pm_printf(PM_LOG_DEBUG, "config: include globing read error for %s\n", ptr); + break; + default: + for(int gindex = 0; gindex < globbuf.gl_pathc; gindex++) { + pm_printf(PM_LOG_DEBUG, "config: including %s\n", globbuf.gl_pathv[gindex]); + _parseconfig(globbuf.gl_pathv[gindex], section, db); + } + break; + } /* Ignore include failures... assume non-critical */ } else if(strcmp(section, "options") == 0) { if(strcmp(key, "NoUpgrade") == 0) { This patch addes the ability to use Include filenames containing wildcards and also expands the tilde to the homedir of the executing user. Signed-off-by: Marc-A. Dahlhaus <mad(a)wol.de> --- diff -Nurp pacman-3.3.0.orig/src/pacman/pacman.c pacman-3.3.0/src/pacman/pacman.c --- pacman-3.3.0.orig/src/pacman/pacman.c 2009-08-01 20:07:42.000000000 +0200 +++ pacman-3.3.0/src/pacman/pacman.c 2009-09-10 21:11:03.000000000 +0200 @@ -38,6 +38,7 @@ #include <locale.h> /* setlocale */ #include <time.h> /* time_t */ #include <errno.h> +#include <glob.h> #if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) #include <mcheck.h> /* debug tracing (mtrace) */ #endif @@ -814,8 +815,23 @@ static int _parseconfig(const char *file } else { /* directives with settings */ if(strcmp(key, "Include") == 0) { - pm_printf(PM_LOG_DEBUG, "config: including %s\n", ptr); - _parseconfig(ptr, section, db); + int globret; + glob_t globbuf; + globret = glob(ptr, GLOB_TILDE_CHECK, NULL, &globbuf); + switch(globret) { + case GLOB_NOSPACE: + pm_printf(PM_LOG_DEBUG, "config: include globing out of space\n"); + break; + case GLOB_ABORTED: + pm_printf(PM_LOG_DEBUG, "config: include globing read error for %s\n", ptr); + break; + default: + for(int gindex = 0; gindex < globbuf.gl_pathc; gindex++) { + pm_printf(PM_LOG_DEBUG, "config: including %s\n", globbuf.gl_pathv[gindex]); + _parseconfig(globbuf.gl_pathv[gindex], section, db); + } + break; + } /* Ignore include failures... assume non-critical */ } else if(strcmp(section, "options") == 0) { if(strcmp(key, "NoUpgrade") == 0) {

4 15

[pacman-dev] [PATCH] alpm_list_diff_sorted - make some arguements const
by Allan McRae 24 Mar '10

24 Mar '10

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm_list.c | 8 ++++---- lib/libalpm/alpm_list.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index 80aa558..80ba1ee 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -657,12 +657,12 @@ char SYMEXPORT *alpm_list_find_str(const alpm_list_t *haystack, * @param onlyright pointer to the second result list * */ -void SYMEXPORT alpm_list_diff_sorted(alpm_list_t *left, - alpm_list_t *right, alpm_list_fn_cmp fn, +void SYMEXPORT alpm_list_diff_sorted(const alpm_list_t *left, + const alpm_list_t *right, alpm_list_fn_cmp fn, alpm_list_t **onlyleft, alpm_list_t **onlyright) { - alpm_list_t *l = left; - alpm_list_t *r = right; + const alpm_list_t *l = left; + const alpm_list_t *r = right; if(!onlyleft && !onlyright) { return; diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index fcab301..bd639f7 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -78,7 +78,7 @@ void *alpm_list_find(const alpm_list_t *haystack, const void *needle, alpm_list_ void *alpm_list_find_ptr(const alpm_list_t *haystack, const void *needle); char *alpm_list_find_str(const alpm_list_t *haystack, const char *needle); alpm_list_t *alpm_list_diff(const alpm_list_t *lhs, const alpm_list_t *rhs, alpm_list_fn_cmp fn); -void alpm_list_diff_sorted(alpm_list_t *left, alpm_list_t *right, +void alpm_list_diff_sorted(const alpm_list_t *left, const alpm_list_t *right, alpm_list_fn_cmp fn, alpm_list_t **onlyleft, alpm_list_t **onlyright); #ifdef __cplusplus -- 1.7.0.3

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-146-gcdbb90a
by dan＠archlinux.org 24 Mar '10

24 Mar '10

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 cdbb90aceb288034dbf4f228fc4c49da1e2ed0c0 (commit) via ad4efa539de1e8e9e51baee82efeafde9fb24380 (commit) from f6c7de77edee89650e8dabf728f296d48cd4b3e0 (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 cdbb90aceb288034dbf4f228fc4c49da1e2ed0c0 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 7 21:52:09 2009 -0500 Show 'Required By' in -Sii output Just as we do in -Qi, we can compute required by information for sync database packages. The behavior seems sane; for a given package, the -Sii required by will show all packages in *any* sync database that require it. Implements FS#16244. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ad4efa539de1e8e9e51baee82efeafde9fb24380 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Mar 18 21:46:03 2010 -0500 Strip extension off all package compression types Since we were searching for '.pkg.tar.gz' before, we now have started to show extensions during the download when we have a '.pkg.tar.xz' package. Just look for '.pkg.tar.' (or '.db.tar.') instead and suppress anything found from that point on. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/package.c | 42 ++++++++++++++++++++++++++++++++---------- src/pacman/callback.c | 2 +- src/pacman/package.c | 16 +++++++++------- src/pacman/package.h | 2 +- src/pacman/sync.c | 6 +++--- 5 files changed, 46 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] makepkg: Add -q/--question output
by Allan McRae 22 Mar '10

22 Mar '10

Hi all, This is a request for comments on FS#18709. It requests adding a -q/--question option similar to make which does nothing but returns 0 if all packages are already built and 1 if not. It might be useful in scripts. Any opinions on this? I see no reason why not. The name is a bit weird but given that is what make uses, I see no reason not to be consistent. There is a patch (http://bugs.archlinux.org/task/18709?getfile=5006) which is fairly minor, but needs reviewing and documentation. Allan

2 1

Re: [pacman-dev] [arch-general] rankmirrors with arch-games
by Dan McGee 20 Mar '10

20 Mar '10

On Thu, Mar 18, 2010 at 9:42 PM, Daenyth Blank <daenyth+arch(a)gmail.com> wrote: > For some reason rankmirrors seems to really hate the arch-games > mirrorlist. I don't know whether it's a bug or whether there's some > sort of server misconfiguration. > > [root@Muspelheimr pacman.d]# rankmirrors -t archgames-mirrorlist > Querying servers, this may take some time... > * * * * > Servers sorted by time (seconds): > http://pseudoform.org/arch-games/games/i686 #(Nürnberg, Germany. > Maintainer: svenstaro) : 1.01 > http://repo.exigen.org/arch/games/i686 #(Düsseldorf, Germany. > Maintainer: s4msung) : unreachable > http://repo.archlinux-gaming.org/i686 #(Toronto, Canada. Primary > mirror) : unreachable > ftp://mirror.selfnet.de/arch-games/i686 #(Stuttgart, Germany. > Maintainer: hrist) : unreachable > > All of the above servers respond to ping and their repos can be > browsed manually and synced with using pacman. So let's compare a "normal" mirror location with those from arch-games and what we know works. normal: ftp://ftp.archlinux.org/core/os/i686 works: http://pseudoform.org/arch-games/games/i686 not work: http://repo.exigen.org/arch/games/i686 rankmirrors assumes the repository name is the third component from the end; the normal URL would thus produce "core" and look for "core.db.tar.gz" and the working arch-games URL would see "arch-games" and look for "arch-games.db.tar.gz". The non-working URLs thus are guessing the db name incorrectly; the one I listed above would look for "arch.db.tar.gz" and fail to find it, thus the unreachable in the output. I cross-posted this to pacman-dev, but we have a bit of a oddity here as the rankmirrors python script was recently replaced by a bash version, and it does an absolutely abominable job on this mirrorlist due to the inline comments: $ rankmirrors test-mirrorlist # Server list generated by rankmirrors on 2010-03-20 # # Arch Games repository mirrorlist # url `' is malformed. I'm not super thrilled about this regression. Either way, I think we should probably add an option to the scripts to use a designated file as the target for rankmirrors testing; this way you could specify a DB filename or any other file as the target to test against. -Dan

1 0

[pacman-dev] [PATCH] configure.ac : disable doc by default and check for asciidoc
by Xavier Chantry 18 Mar '10

18 Mar '10

This is a complaint that has been reported many many times. By default, docs are enabled and there is no check for asciidoc, so anyone building from git will see their build fail. We cannot do a strict check for asciidoc because released source tarballs have man pages already built, and it should be possible to install them without having asciidoc. This patch attempts to improve the situation in two ways : 1) disable doc by default 2) print a warning if docs are enabled but asciidoc is not installed Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- configure.ac | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index faf774f..aab0e4b 100644 --- a/configure.ac +++ b/configure.ac @@ -100,8 +100,8 @@ AC_ARG_ENABLE(internal-download, # Help line for documentation AC_ARG_ENABLE(doc, - AS_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]), - [wantdoc=$enableval], [wantdoc=yes]) + AS_HELP_STRING([--enable-doc], [run make in doc/ dir]), + [wantdoc=$enableval], [wantdoc=no]) # Help line for doxygen AC_ARG_ENABLE(doxygen, @@ -261,12 +261,18 @@ AC_SUBST(CARCHFLAGS) AC_SUBST(CHOST) # Check for documentation support and status +AC_CHECK_PROGS([ASCIIDOC], [asciidoc]) AC_MSG_CHECKING([for building documentation]) if test "x$wantdoc" = "xyes" ; then - AC_MSG_RESULT([yes]) + if test $ASCIIDOC ; then + AC_MSG_RESULT([yes, enabled by configure]) + else + asciidoc="(warning : asciidoc not installed)" + AC_MSG_RESULT([yes $asciidoc]) + fi wantdoc=yes else - AC_MSG_RESULT([no, disabled by configure]) + AC_MSG_RESULT([no]) wantdoc=no fi AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes") @@ -389,7 +395,7 @@ ${PACKAGE_NAME}: build script name : ${BUILDSCRIPT} Compilation options: - Run make in doc/ dir : ${wantdoc} + Run make in doc/ dir : ${wantdoc} ${asciidoc} Use download library : ${internaldownload} Doxygen support : ${usedoxygen} debug support : ${debug} -- 1.7.0.2

3 11

[pacman-dev] Rif: Re: pacman problems
by antonio.grande＠uniroma1.it 18 Mar '10

18 Mar '10

1 0

[pacman-dev] pacman problems
by antonio.grande＠uniroma1.it 18 Mar '10

18 Mar '10

I'am a newbie so please thank you for your patience. Executing pacman -S samba I've this error: failed retriving file 'tdb-1.2.0-1-i686.pkg.tar.gz' But both two mirrors I've in my etc/pacman.d/mirrorlist contain the filename "tdb-1.2.1-1-i686.pkg.tar.xz" where there is a difference about the version 1.2.1 and also in the extension .xz instead of .gz My pacman version is 3.3.3-1 which is the latest. Someone can help me? Thank you. Antonio Grande

4 3

[pacman-dev] [PATCH] Remove unused 'z' option from getopt_long's optstring
by Nagy Gabor 16 Mar '10

16 Mar '10

In addition, I permuted shortopts to make it more readable. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/pacman.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 750afca..7fe8514 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -416,7 +416,7 @@ static int parseargs(int argc, char *argv[]) {0, 0, 0, 0} }; - while((opt = getopt_long(argc, argv, "RUDQSTr:b:vkhscVfmnoldepqituwygz", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "DQRSTUVb:cdefghiklmnopqr:stuvwy", opts, &option_index))) { alpm_list_t *list = NULL, *item = NULL; /* lists for splitting strings */ if(opt < 0) { -- 1.7.0.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-144-gf6c7de7
by dan＠archlinux.org 16 Mar '10

16 Mar '10

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 f6c7de77edee89650e8dabf728f296d48cd4b3e0 (commit) from a36ff9404b59b249b436282f5b69d8ed136a7c8d (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 f6c7de77edee89650e8dabf728f296d48cd4b3e0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Mar 15 23:03:29 2010 -0500 Unbreak the database partial extraction code Basically I'm the idiot that thought I could make it better and completely forgot how freeing the contents of the original lists would screw up our nice little diff extraction lists. This caused segfaults among other problems. Last time I try to do that... Program received signal SIGSEGV, Segmentation fault. 0x00007ffff627ce26 in strcmp () from /lib/libc.so.6 (gdb) bt Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_files.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pacman, formatted output
by tuxce 15 Mar '10

15 Mar '10

Hi, I made a little program in C, package-query to query alpm and aur. He takes an option to format his output and I'm wondering if this feature can be implemented in pacman (just for alpm of course). I think I can provide a patch to implement it for queries like -{Q,S}s with an option --format, but I don't know if it could interest. To see how it renders, you can try package-query-git from AUR, example: $ # repo/name version [local version] $ package-query -Ss pacman -f "%r/%n %v [%l]" core/pacman 3.3.3-1 [3.3.3-1] core/pacman-mirrorlist 20100131-1 [20100131-1] extra/namcap 2.5-1 [2.5-1] extra/srcpac 0.7-1 [-] community/pacman-contrib 3.3.3-1 [3.3.3-1] community/pacpan 4.0-4 [-] community/pacupdate 0.1.1-2 [-] community/powerpill 17.1-1 [17.1-1] community/xpacman 0.11-4 [-] community/xpacman2 1.002-2 [-] btw, thanks for the work done in alpm, I found it quite simple to understand even if there is no documentation :)

2 2

[pacman-dev] [PATCH] Show --print and --print-format options with -Rh, -Sh and -Uh only
by Nagy Gabor 15 Mar '10

15 Mar '10

http://mailman.archlinux.org/pipermail/pacman-dev/2010-March/010519.html Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/pacman.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 6778ea2..fdc53db 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -95,6 +95,9 @@ static void usage(int op, const char * const myname) printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n" " (-ss includes explicitly installed dependencies too)\n")); printf(_(" -u, --unneeded remove unneeded packages (that won't break packages)\n")); + printf(_(" --print only print the targets instead of performing the operation\n")); + printf(_(" --print-format <string>\n" + " specify how the targets should be printed\n")); } else if(op == PM_OP_UPGRADE) { printf("%s: %s {-U --upgrade} [%s] <%s>\n", str_usg, myname, str_opt, str_file); printf("%s:\n", str_opt); @@ -102,6 +105,9 @@ static void usage(int op, const char * const myname) printf(_(" --asexplicit install packages as explicitly installed\n")); printf(_(" -d, --nodeps skip dependency checks\n")); printf(_(" -f, --force force install, overwrite conflicting files\n")); + printf(_(" --print only print the targets instead of performing the operation\n")); + printf(_(" --print-format <string>\n" + " specify how the targets should be printed\n")); } else if(op == PM_OP_QUERY) { printf("%s: %s {-Q --query} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); @@ -138,6 +144,9 @@ static void usage(int op, const char * const myname) printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); printf(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); + printf(_(" --print only print the targets instead of performing the operation\n")); + printf(_(" --print-format <string>\n" + " specify how the targets should be printed\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); @@ -145,9 +154,6 @@ static void usage(int op, const char * const myname) printf(_(" --asdeps mark packages as non-explicitly installed\n")); printf(_(" --asexplicit mark packages as explicitly installed\n")); } - printf(_(" --print only print the targets instead of performing the operation\n")); - printf(_(" --print-format <string>\n" - " specify how the targets should be printed\n")); printf(_(" --config <path> set an alternate configuration file\n")); printf(_(" --logfile <path> set an alternate log file\n")); printf(_(" --noconfirm do not ask for any confirmation\n")); -- 1.7.0.2

1 0

[pacman-dev] [PATCH] More consistent printing of off_t and time_t
by Xavier Chantry 15 Mar '10

15 Mar '10

From: Xavier Chantry <shiningxc(a)gmail.com> time_t : %ld off_t : %jd and cast to intmax_t Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- lib/libalpm/be_files.c | 6 +++--- lib/libalpm/delta.c | 2 +- lib/libalpm/dload.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 4ddb136..d674f33 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -25,7 +25,7 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include <stdint.h> /* uintmax_t, intmax_t */ +#include <stdint.h> /* intmax_t */ #include <sys/stat.h> #include <dirent.h> #include <ctype.h> @@ -835,11 +835,11 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) } if(info->builddate) { fprintf(fp, "%%BUILDDATE%%\n" - "%ju\n\n", (uintmax_t)info->builddate); + "%ld\n\n", info->builddate); } if(info->installdate) { fprintf(fp, "%%INSTALLDATE%%\n" - "%ju\n\n", (uintmax_t)info->installdate); + "%ld\n\n", info->installdate); } if(info->packager) { fprintf(fp, "%%PACKAGER%%\n" diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 3aa7d5e..7283500 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -337,7 +337,7 @@ pmdelta_t *_alpm_delta_parse(char *line) tmp2 = tmp; STRDUP(delta->to, tmp2, RET_ERR(PM_ERR_MEMORY, NULL)); - _alpm_log(PM_LOG_DEBUG, "delta : %s %s '%lld'\n", delta->from, delta->to, (long long)delta->delta_size); + _alpm_log(PM_LOG_DEBUG, "delta : %s %s '%jd'\n", delta->from, delta->to, (intmax_t)delta->delta_size); return(delta); } diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index cff5cc5..c11148d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -190,8 +190,8 @@ static int download_internal(const char *url, const char *localpath, _alpm_log(PM_LOG_DEBUG, "ust.mtime: %ld local_time: %ld compare: %ld\n", ust.mtime, local_time, local_time - ust.mtime); - _alpm_log(PM_LOG_DEBUG, "ust.size: %"PRId64" local_size: %"PRId64" compare: %"PRId64"\n", - ust.size, local_size, local_size - ust.size); + _alpm_log(PM_LOG_DEBUG, "ust.size: %jd local_size: %jd compare: %jd\n", + (intmax_t)ust.size, (intmax_t)local_size, (intmax_t)(local_size - ust.size)); if(!force && ust.mtime && ust.mtime == local_time && ust.size && ust.size == local_size) { /* the remote time and size values agreed with what we have, so move on @@ -224,7 +224,7 @@ static int download_internal(const char *url, const char *localpath, fclose(localf); localf = NULL; } else if(fileurl->offset) { - _alpm_log(PM_LOG_DEBUG, "resuming download at position %"PRId64"\n", fileurl->offset); + _alpm_log(PM_LOG_DEBUG, "resuming download at position %jd\n", (intmax_t)fileurl->offset); } -- 1.7.0.2

1 0

[pacman-dev] pacman -Q --print
by Nagy Gabor 15 Mar '10

15 Mar '10

I have a minor comment on pacman --print: pacman -Q --print is the same as pacman -Qp, so the result of "pacman -Qi evince --print" is 'error: package "evince" not found', because pacman searches for 'evince' package file. Clearly, it is stupid to use --print with -Q, but pacman shows that option with -Qh. I think we should not show "--print" with all -h operations, this is needless with (not yet implemented) -Dh, too. Then I think we can forget about my minor comment above. Bye

2 1

[pacman-dev] group handling in next release
by Xavier Chantry 15 Mar '10

15 Mar '10

On Mon, Mar 15, 2010 at 2:13 AM, Dan McGee <dpmcgee(a)gmail.com> wrote: > On Sun, Mar 14, 2010 at 8:06 PM, Xavier Chantry > <chantry.xavier(a)gmail.com> wrote: >> On Mon, Mar 15, 2010 at 1:44 AM, Dan McGee <dpmcgee(a)gmail.com> wrote: >>> >>> Haha, whoops! I went a little crazy cherry-picking and started >>> grabbing stuff that looked good. >>> >> >> Heh nice raid indeed :) >> I did not touch pacman for 4 months, maybe it's time to get back on >> track. I always have lots of new not-pacman things to work on though. >> Anyway I am guessing my git repo is empty now. >> >> I just checked nagy one, and there is still the -D patch dying there : >> http://repo.or.cz/w/pacman-ng.git/shortlog/refs/heads/working >> Too bad we did not come to an agreement last time it was sent to ML. > > Yeah, I'll try to look that over and see what I can remember. I do > feel bad having work sit out there unused. > > I'm thinking a release of what we have in a month or so? That seems > feasible given our normal slow pace and would at least let the 140 > patches since 3.3.X get out there. Obviously some of the bigger > changes I would like to do still haven't happened, but that shouldn't > hold us up here. > I don't remember if I brought this up before. I intended to.. I have one problem. It seems this commit could make a lot of users unhappy : http://projects.archlinux.org/pacman.git/commit/?id=b4317a740ac2d4f5e4d1aa5… While I was writing this mail, I was sure I brought this up already. I just found some old jabber chat. 6:46 PM me: hey 51 minutes 7:38 PM toofishes: hey whats up 7:39 PM me: I should let you know I had a complaint from wonder about my rework of group handling 7:40 PM toofishes: what was the complaint? me: you know this old behavior : :: group gnome-extra (including ignored packages): eog vino :: Install whole content? [Y/n] n :: Install eog from group gnome-extra? [Y/n] :: Install vino from group gnome-extra? [Y/n] n I lost that when moving group handling to backend toofishes: yeah what does it do now again? me: lost all the interaction / questions 7:41 PM it should just select everything without asking select all targets from the group 7:42 PM this morning I asked on IRC if any users used/liked that feature, I got another two very positive answers 7:43 PM http://code.toofishes.net/cgit/dan/pacman.git/commit/?id=b4317a740ac the reasons of this change were explained by nagy in a mail : http://mailman.archlinux.org/pipermail/pacman-dev/2009-June/008847.html 7:44 PM to sum up : the frontend can query what is in a group and gets a list of packages pmpkg toofishes: yeah 7:45 PM me: but it can only add the name of package : char * as a target to the transaction i.e. there is a loss of information 7:46 PM the same package name can be in multiple repo. or there can even be provisions 7:49 PM toofishes: yeah we should either accept pmpkg_t or accept a "unique" name like 'repo/pkg' the former seems smarter 7:50 PM me: note that by moving group loading to backend, I worked around / eliminated that problem 7:51 PM the backend can just query the group and do whatever it wants, in particular it can add the pmpkg to the transaction itself without problems but now.. if I think about interactivity and being able to only select some packages from a group 7:52 PM also if I think about what a different frontend, especially graphical one would do 7:54 PM it seems it makes more sense to let the frontend handle that. just give the ability to return a list of pmpkg from a group. but then allow to add a pmpkg or list of pmpkg as a transaction target

1 0

[pacman-dev] makepkg: only strip files that are writable
by Xavier Chantry 15 Mar '10

15 Mar '10

On Mon, Mar 15, 2010 at 1:37 AM, Allan McRae <allan(a)archlinux.org> wrote: > On 15/03/10 09:36, Dan McGee wrote: >> >> commit a4e3fd18474186ac81acca91adecbb905aee3357 >> Author: Allan McRae<allan(a)archlinux.org> >> Date: Tue Jan 26 23:29:31 2010 +1000 >> >> makepkg: only strip files that are writable >> >> TODO: >> http://mailman.archlinux.org/pipermail/pacman-dev/2010-January/010390.html >> >> Signed-off-by: Allan McRae<allan(a)archlinux.org> >> Signed-off-by: Dan McGee<dan(a)archlinux.org> > > Hmmm.... that one was not quite finished yet which is why it was not on my > working branch. (I put it on a wip = "work in progress" branch). > > Nevermind! Apart from a strange commit message, it is still an improvement > on the pre-patch state. :P > > > Looks like I never got to answer your mail. I wrote a stupid 10 lines bash program that tested every permission, and it seemed that both r and w were needed for strip. But IIRC, I did one test inside makepkg (so using fakeroot) and got different results. Actually I was probably so confused by the permissions I got in package built by makepkg that I completely gave up. Now I remember why I did not answer, I have only new confusions to bring...

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-134-g087be2f
by dan＠archlinux.org 15 Mar '10

15 Mar '10

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 087be2f1fbae2d7168732c7004d8963a3d9d21d8 (commit) via 6f0ffb23860e8d1b4593d60e970919ae7b31340d (commit) via 5fe41df8a9eaac288433a54e216f96b1fe729c01 (commit) via 22331fdadb1b055030a6f68e2bb9eed589187a10 (commit) via 65d43fbb843e035812dde4578afa98c4e7388374 (commit) via a4e3fd18474186ac81acca91adecbb905aee3357 (commit) via de5473c026ea1a8bf8fdb4218a6911b5d5e1f0b2 (commit) via eee61a0bbc2a11f0d2a52d7d22425faaa2aeaef1 (commit) via 7ea0a115db79405db46a38e785765ae968c46dee (commit) from 1a00ee5c276785aef70225c2cc951dbb15888ea5 (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 087be2f1fbae2d7168732c7004d8963a3d9d21d8 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Sep 18 21:59:52 2009 +0200 delta : add external cleanup script Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f0ffb23860e8d1b4593d60e970919ae7b31340d Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 5 14:17:57 2010 +1000 makepkg: always update symlinks to compressed man pages When a man page has both symbolic and hard links, any symlink pointing to other than the alphabetically first hardlink was not "compressed" and left dangling towards the uncompressed man page. Fixes FS#18569. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5fe41df8a9eaac288433a54e216f96b1fe729c01 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Mon Dec 21 20:26:28 2009 +0100 makepkg: make strip options configurable The newly added variables STRIP_BINARIES, STRIP_SHARED and STRIP_STATIC, that are set in makepkg.conf, specify the strip options used on binaries and shared and static libraries. In addition, files are now stripped more aggressively by default. Implements FS#13592 the way it was suggested by Allan in the comments. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 22331fdadb1b055030a6f68e2bb9eed589187a10 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Mar 6 22:02:36 2010 +1000 makepkg: Remove setgid bit on srcdir/pkgdir creation It was noted in FS#17533 that setgid bits are carried down into any created subdirectories, and thus could end up being in a built package if the original package directory was marked g+s. When we create src/ and pkg/, explicitly chmod them to remove any sticky bits. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 65d43fbb843e035812dde4578afa98c4e7388374 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 7 17:31:26 2010 +1000 makepkg: abort on missing or non-writable PKGDEST When PKGDEST pointed to a non-writable location, makepkg would fail after completing the build process. This patch makes it abort as soon as PKGDEST is parsed. Also, move the SRCDEST check to the same point rather than right before downloading sources (which was after dependency checks). Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a4e3fd18474186ac81acca91adecbb905aee3357 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 26 23:29:31 2010 +1000 makepkg: only strip files that are writable TODO: http://mailman.archlinux.org/pipermail/pacman-dev/2010-January/010390.html Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit de5473c026ea1a8bf8fdb4218a6911b5d5e1f0b2 Author: Nezmer <git(a)nezmer.info> Date: Wed Jan 20 17:34:42 2010 +0200 makepkg: Add documentation for the new SRCPKGDEST variable Add SRCPKGDEST documentation to the makepkg.conf man page Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit eee61a0bbc2a11f0d2a52d7d22425faaa2aeaef1 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Fri Dec 4 17:49:54 2009 +0100 makepkg: document environment variables PKGDEST and SRCDEST Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ea0a115db79405db46a38e785765ae968c46dee Author: Allan McRae <allan(a)archlinux.org> Date: Thu Feb 25 13:41:46 2010 +1000 makepkg: update required programs Remove getopt, add xz. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 9 +++ doc/Makefile.am | 13 ++++- doc/makepkg.8.txt | 8 +++ doc/makepkg.conf.5.txt | 17 ++++++ etc/Makefile.am | 3 + etc/makepkg.conf.in | 6 ++ lib/libalpm/alpm.h | 1 + lib/libalpm/delta.c | 46 +++++++++++++++- scripts/makepkg.sh.in | 59 +++++++++++++-------- src/util/.gitignore | 3 + src/util/Makefile.am | 6 ++- src/util/cleanupdelta.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 276 insertions(+), 29 deletions(-) create mode 100644 src/util/cleanupdelta.c hooks/post-receive -- The official pacman repository

4 4

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-143-ga36ff94
by dan＠archlinux.org 15 Mar '10

15 Mar '10

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-142-g1aa1d00
by dan＠archlinux.org 15 Mar '10

15 Mar '10

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 1aa1d00248ac89fb02e762b96c58559a04679b2e (commit) from be2f43191d0d0cdf02d72ac72a013697b0f7e879 (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 1aa1d00248ac89fb02e762b96c58559a04679b2e Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Dec 5 01:50:09 2009 +0100 fix a few warnings reported by clang - remove unused variables - some more sanity checks - safer printf Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 2 ++ lib/libalpm/be_files.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/package.c | 3 +-- src/pacman/callback.c | 4 +++- src/pacman/pacman.c | 2 +- src/pacman/util.c | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-141-gbe2f431
by dan＠archlinux.org 15 Mar '10

15 Mar '10

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 be2f43191d0d0cdf02d72ac72a013697b0f7e879 (commit) via 2f4ee4341d1f97d95a99147556888212d1cd4507 (commit) via 69b3a811a138a84aa09e8e81b2912f6fcd0b47b9 (commit) via d39b1dbe627af218e49be6424857089a5888903b (commit) via 67700b926a1eff745272975e7b089b80bf72cc30 (commit) via e4be3e06af7f96c279851c3f2d7f1d294b8b8e70 (commit) via e5dce888c09976f1ef4664613c742d0d015e534e (commit) from 087be2f1fbae2d7168732c7004d8963a3d9d21d8 (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 be2f43191d0d0cdf02d72ac72a013697b0f7e879 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 14 19:16:26 2010 -0500 Reduce duplicate code in DB extraction Follow-up to the previous "Only extract new DB entries" patch; move the partial extraction code inside one side of the loop so we can use the same code for actually doing file extraction. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2f4ee4341d1f97d95a99147556888212d1cd4507 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Oct 10 03:11:27 2009 +1000 Only extract new DB entries This implements FS#15198. The idea apparently came from Csaba Henk <csaba-ml <at> creo.hu> which submitted a patch to Frugalware, so thanks to him, even though I did not look at the code :) The idea is to only extract folders for new packages into the package database and clean up the old directories. This is essentially implementing Xyne's "rebase" script within pacman. If using -Syy, just remove and extract everything. If using -Sy : 1. Generate list of directories in DB 2. Generate list of directories in archive 3. Compare both 4. Clean up old directories 5. Extract new directories Original-work-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Dan: fix compile error, s/int/size_t/] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 69b3a811a138a84aa09e8e81b2912f6fcd0b47b9 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 14 18:47:40 2010 -0500 Mark two functions static These were just introduced in the `--print` patch, and don't need to be exposed outside of util.c. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d39b1dbe627af218e49be6424857089a5888903b Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Jul 19 11:15:11 2009 +0200 Add new --print operation for all operations And a new --print-format option to configure the output. This implements FS#14208 Example usage : pacman -Sp --print-format "%r/%n-%v : %l [%s]" kdelibs extra/kdelibs-4.3.2-4 : ftp://mir2.archlinuxfr.org/archlinux/extra/os/i686/kdelibs-4.3.2-4-i686.pkg… [0,00] Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 67700b926a1eff745272975e7b089b80bf72cc30 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Sep 4 20:18:49 2009 +0200 print installed packages Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e4be3e06af7f96c279851c3f2d7f1d294b8b8e70 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Dec 16 02:38:32 2009 +0100 callback: use variable length for progressbar text This fixes FS#17523 We always used a fixed value of 50 for textlen, which is often not enough for download progress bar. At least we can use a bigger width on large terminal (e.g. 60% of width) and keep 50 as minimum. before: nautilus-2.28.4-1-x... 5.7M 789.2K/s 00:00:07 [####################################] 100% after: nautilus-2.28.4-1-x86_64 5.7M 770.7K/s 00:00:08 [##############################] 100% Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e5dce888c09976f1ef4664613c742d0d015e534e Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Dec 16 02:16:00 2009 +0100 callback.c : less magic progress bars 1 - Explain magic numbers 2 - There was a weird off by 1 mess in the progress bar. The code supposedly shared the width between 50 chars for text (textlen) and the rest for the progress bar (proglen = getcols() - textlen). But the code actually used textlen + 1 for the text and proglen - 1 for the progress bar (with haslen=1, the progress bar was actually empty), which was a bit confusing so I changed it. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 9 ++- contrib/zsh_completion | 1 + doc/pacman.8.txt | 16 +++-- lib/libalpm/be_files.c | 167 ++++++++++++++++++++++++++++++++++++++++++----- lib/libalpm/util.c | 3 +- src/pacman/callback.c | 38 +++++++---- src/pacman/conf.c | 1 + src/pacman/conf.h | 6 +- src/pacman/pacman.c | 23 +++++-- src/pacman/remove.c | 6 ++ src/pacman/sync.c | 50 +++++++------- src/pacman/upgrade.c | 8 ++- src/pacman/util.c | 120 +++++++++++++++++++++++++++++++--- src/pacman/util.h | 1 + 14 files changed, 369 insertions(+), 80 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Add a "provided" field in PKGBUILD
by Diego Ferigo 14 Mar '10

14 Mar '10

Hi guys! I have a propose for pacman/makepkg...Now I'm going to explain my idea... In AUR there are some problems regarding the dependencies management...Particularly when a package, that from this moment I'll call * subpackage*, is a part of another package, that I'll call *main_package*(example gnome-python-desktop and python-wnck). It would be nice if the maintainer of the subpackage could add a field * provided* (or another name), that point out to the package that contains it... Obliviously the 2 packages go in conflict because they share the same files..Now the solution is to add a provides field in the main_package, done by his maintainer...The maintainer of the main_package has to add a new object in provides array, every new subpackage created. This new field, provided, get the main_package maintainer off to this change, and it give the duty to the subpackage maintainer. I opened a bug some weeks ago, requesting the add of provides= in a extra package, but the problem remained unsolved because AUR and repos are 2 different things. This method can solve a lot of dependencies problem that happened (to me) in this period...And it is more kiss imho.... What do you think? Diego Ferigo -- http://darchlinux.netsons.org

2 1

[pacman-dev] makepkg and VCS packages
by Allan McRae 12 Mar '10

12 Mar '10

Hi all, There are a number of bug reports about improving VCS support in makepkg. To address many of these, we really need to give this whole part of makepkg an overhaul. I have create a wiki page [1] where i have made some initial notes and will start filling out brainstorming for ideas on how this could be improved. Please add any ideas people have for how these could be improved. [1] http://wiki.archlinux.org/index.php/User:Allan/Makepkg_VCS_overhaul Allan

2 1

[pacman-dev] [PATCH] external debug symbols
by Bernhard Beschow 11 Mar '10

11 Mar '10

Hello pacman devs, I'm an Arch user and I really enjoy the tight integration of the KDE packages from the extra repository. Given that Arch seems to be one of the best KDE distros around, it's a pity that - unlike many other distros - Arch doesn't provide (external) debug symbols. However, these are critical for useful crash reports. Moreover, the KDE crash dialogue even prevents reporting crashes to bugzilla when no debug symbols are present. Sure, there are two obvious alternatives: 1) use kdemod, or 2) compile own packages with debug symbols. However, both have drawbacks: kdemod isn't integrated as tightly into Arch, wich means that things could break. The second option takes a lot of resources and a lot of time, especially on low-end hardware. That's why I propose that Arch should deliver extra packages with external debug symbols. To help you out, I've added support for external debug symbols to the makepkg tool [1]. BTW, my patch is based on the kdemod-version of makepkg. I've tested the patch with the kdeplasma-addons module and got a separate debug package for each split package without modifying the PKGBUILD. So I can say that it "works for me". However, it would be nice if there was a chance for the patch to get merged so it works for all Arch users. What do you think? Greetings, Bernhard [1] http://gitorious.org/pacman-shentey/pacman-shentey

2 1

[pacman-dev] [PATCH] makepkg: abort on missing or non-writable PKGDEST
by Allan McRae 07 Mar '10

07 Mar '10

When PKGDEST pointed to a non-writable location, makepkg would fail after completing the build process. This patch makes it abort as soon as PKGDEST is parsed. Also, move the SRCDEST check to the same point rather than right before downloading sources (which was after dependency checks). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5560c77..a087ee7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -454,12 +454,6 @@ remove_deps() { download_sources() { msg "$(gettext "Retrieving Sources...")" - if [[ ! -w $SRCDEST ]] ; then - error "$(gettext "You do not have write permission to store downloads in %s.")" "$SRCDEST" - plain "$(gettext "Aborting...")" - exit 1 - fi - pushd "$SRCDEST" &>/dev/null local netfile @@ -1644,8 +1638,20 @@ readonly ALL_OFF BOLD BLUE GREEN RED YELLOW # override settings with an environment variable for batch processing PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined +if [[ ! -w $PKGDEST ]]; then + error "$(gettext "You do not have write permission to store packages in %s.")" "$PKGDEST" + plain "$(gettext "Aborting...")" + exit 1 +fi + SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined +if [[ ! -w $SRCDEST ]] ; then + error "$(gettext "You do not have write permission to store downloads in %s.")" "$SRCDEST" + plain "$(gettext "Aborting...")" + exit 1 +fi + SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST} SRCPKGDEST=${SRCPKGDEST:-$PKGDEST} #default to $PKGDEST if undefined -- 1.7.0.1

1 0

[pacman-dev] [PATCH] makepkg: fall back to su if sudo is not available
by Ray Kohler 06 Mar '10

06 Mar '10

There's a bit of a hack here with the "fullcmd" temporary variable to get around the need to pass the entire command line to su -c as one argument. Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> --- scripts/makepkg.sh.in | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5bd294c..2dc9262 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -344,8 +344,13 @@ download_file() { run_pacman() { local ret=0 - if (( ! ASROOT )) && [[ $1 != "-T" ]] && sudo -l $PACMAN &>/dev/null; then - sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? + if (( ! ASROOT )) && [[ $1 != "-T" ]]; then + if [ "$(type -p sudo)" ] && sudo -l $PACMAN &>/dev/null; then + sudo $PACMAN $PACMAN_OPTS "$@" || ret=$? + else + fullcmd="$PACMAN $PACMAN_OPTS $@" + su -c "$fullcmd" || ret=$? + fi else $PACMAN $PACMAN_OPTS "$@" || ret=$? fi @@ -1686,16 +1691,6 @@ else fi fi -# check for sudo if we will need it during makepkg execution -if (( ! ASROOT && ( DEP_BIN || RMDEPS || INSTALL ) )); then - if [ ! "$(type -p sudo)" ]; then - error "$(gettext "Cannot find the sudo binary! Is sudo installed?")" - plain "$(gettext "Missing dependencies cannot be installed or removed as a normal user")" - plain "$(gettext "without sudo; install and configure sudo to auto-resolve dependencies.")" - exit 1 - fi -fi - unset pkgname pkgbase pkgver pkgrel pkgdesc url license groups provides unset md5sums replaces depends conflicts backup source install changelog build unset makedepends optdepends options noextract -- 1.7.0

3 7