- Pacman-dev - lists.archlinux.org

[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