- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Change -z|--showsize flag to ShowSize pacman.conf option
by Nathan Jones 01 Jun '07

01 Jun '07

Also, some duplicate printf lines related to the ShowSize option were cleaned up. Dan, I created this diff against your tree not the official one, if it makes a difference when applying. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- doc/pacman.conf.5 | 4 ++++ lib/libalpm/alpm.c | 3 +++ lib/libalpm/alpm.h | 3 +++ lib/libalpm/handle.c | 6 ++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.h | 1 - src/pacman/pacman.c | 4 ---- src/pacman/query.c | 12 +++++------- src/pacman/sync.c | 15 ++++++--------- src/pacman/util.c | 3 ++- 10 files changed, 30 insertions(+), 22 deletions(-) diff --git a/doc/pacman.conf.5 b/doc/pacman.conf.5 index 15f7b95..f7304aa 100644 --- a/doc/pacman.conf.5 +++ b/doc/pacman.conf.5 @@ -85,6 +85,10 @@ Log action messages through \fBsyslog()\fP. This will insert log entries into .TP .B LogFile = \fI/path/to/file\fP Log actions directly to a file. Default is \fI/var/log/pacman.log\fP. +.TP +.B ShowSize +Display the size of individual packages for \fB--sync\fP and \fB--query\fP +modes. .SH REPOSITORY SECTIONS Each repository section defines a section name and at least one location where diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 4239430..db66092 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -959,6 +959,9 @@ int SYMEXPORT alpm_parse_config(char *file, alpm_cb_db_register callback, const } else if(strcmp(origkey, "UseColor") == 0 || strcmp(key, "USECOLOR") == 0) { alpm_option_set_usecolor(1); _alpm_log(PM_LOG_DEBUG, _("config: usecolor")); + } else if(strcmp(origkey, "ShowSize") == 0 || strcmp(key, "SHOWSIZE") == 0) { + alpm_option_set_showsize(1); + _alpm_log(PM_LOG_DEBUG, _("config: showsize")); } else { RET_ERR(PM_ERR_CONF_BAD_SYNTAX, -1); } diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index e2d2b0e..047048c 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -144,6 +144,9 @@ void alpm_option_set_needles(alpm_list_t *needles); unsigned short alpm_option_get_usecolor(); void alpm_option_set_usecolor(unsigned short usecolor); +unsigned short alpm_option_get_showsize(); +void alpm_option_set_showsize(unsigned short showsize); + pmdb_t *alpm_option_get_localdb(); alpm_list_t *alpm_option_get_syncdbs(); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 47abcb3..39caaa9 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -137,6 +137,7 @@ const char *alpm_option_get_xfercommand() { return handle->xfercommand; } unsigned short alpm_option_get_nopassiveftp() { return handle->nopassiveftp; } unsigned short SYMEXPORT alpm_option_get_chomp() { return handle->chomp; } unsigned short alpm_option_get_usecolor() { return handle->use_color; } +unsigned short SYMEXPORT alpm_option_get_showsize() { return handle->showsize; } pmdb_t SYMEXPORT *alpm_option_get_localdb() { return handle->db_local; } alpm_list_t SYMEXPORT *alpm_option_get_syncdbs() @@ -297,4 +298,9 @@ void alpm_option_set_usecolor(unsigned short usecolor) handle->use_color = usecolor; } +void alpm_option_set_showsize(unsigned short showsize) +{ + handle->showsize = showsize; +} + /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 0790ad1..b80f751 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -65,6 +65,7 @@ typedef struct _pmhandle_t { unsigned short nopassiveftp; /* Don't use PASV ftp connections */ unsigned short chomp; /* I Love Candy! */ unsigned short use_color; /* enable colorful output */ + unsigned short showsize; /* Show individual package sizes */ } pmhandle_t; extern pmhandle_t *handle; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 11aa41b..4fff0ab 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -54,7 +54,6 @@ typedef struct __config_t { pmtransflag_t flags; unsigned short noask; unsigned int ask; - unsigned short showsize; } config_t; config_t *config_new(void); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fe70ea1..50265e4 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -131,7 +131,6 @@ static void usage(int op, char *myname) printf(_(" -p, --file <package> query a package file instead of the database\n")); printf(_(" -s, --search <regex> search locally-installed packages for matching strings\n")); printf(_(" -u, --upgrades list all packages that can be upgraded\n")); - printf(_(" -z, --showsize display installed size of each package\n")); } else if(op == PM_OP_SYNC) { printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); @@ -147,7 +146,6 @@ static void usage(int op, char *myname) printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); printf(_(" -y, --refresh download fresh package databases from the server\n")); - printf(_(" -z, --showsize display download size of each package\n")); printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); } printf(_(" --config <path> set an alternate configuration file\n")); @@ -293,7 +291,6 @@ static int parseargs(int argc, char *argv[]) {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, - {"showsize", no_argument, 0, 'z'}, {"noconfirm", no_argument, 0, 1000}, {"config", required_argument, 0, 1001}, {"ignore", required_argument, 0, 1002}, @@ -426,7 +423,6 @@ static int parseargs(int argc, char *argv[]) config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; case 'y': (config->op_s_sync)++; break; - case 'z': config->showsize = 1; break; case '?': return(1); default: return(1); } diff --git a/src/pacman/query.c b/src/pacman/query.c index bb4cfb9..aa360f1 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -146,16 +146,14 @@ int pacman_query(alpm_list_t *targets) alpm_list_t *grp; pmpkg_t *pkg = alpm_list_getdata(i); - /* print the package size with the output if -z option passed */ - if(config->showsize) { + printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); + + /* print the package size with the output if ShowSize option set */ + if(alpm_option_get_showsize()) { /* Convert byte size to MB */ double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); - printf("local/%s %s [%.2f MB]", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg), mbsize); - } else { - printf("local/%s %s", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + printf(" [%.2f MB]", mbsize); } if((grp = alpm_pkg_get_groups(pkg)) != NULL) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 4f11bb4..bb2b977 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -251,18 +251,15 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) alpm_list_t *grp; pmpkg_t *pkg = alpm_list_getdata(j); - /* print the package size with the output if -z option passed */ - if(config->showsize) { + printf("%s/%s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg)); + + /* print the package size with the output if ShowSize option set */ + if(alpm_option_get_showsize()) { /* Convert byte size to MB */ double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); - printf("%s/%s %s [%.2f MB]", alpm_db_get_name(db), - alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg), mbsize); - } else { - printf("%s/%s %s", alpm_db_get_name(db), - alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); + printf(" [%.2f MB]", mbsize); } if((grp = alpm_pkg_get_groups(pkg)) != NULL) { diff --git a/src/pacman/util.c b/src/pacman/util.c index f38be60..7b7ec0b 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -294,7 +294,8 @@ void display_targets(alpm_list_t *syncpkgs) size += dispsize; isize += alpm_pkg_get_isize(pkg); - if(config->showsize) { + /* print the package size with the output if ShowSize option set */ + if(alpm_option_get_showsize()) { /* Convert byte size to MB */ mbdispsize = dispsize / (1024.0 * 1024.0); -- 1.5.1.3

4 4

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-158-gcb9f046
by Dan McGee 01 Jun '07

01 Jun '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via cb9f046945b0365d7d29ee590a31a08bece1879c (commit) from 6d6910388e972d47df6a7a4268cd319e0aaba6d4 (commit) - Log ----------------------------------------------------------------- commit cb9f046945b0365d7d29ee590a31a08bece1879c Author: Juan Pablo González T <lord_jotape(a)yahoo.com.ar> Date: Fri Jun 1 10:30:22 2007 -0400 Updated Spanish Translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: src/pacman/po/es.po | 468 +++++++++++++++++---------------------------------- 1 files changed, 151 insertions(+), 317 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 6d6910388e972d47df6a7a4268cd319e0aaba6d4 \ cb9f046945b0365d7d29ee590a31a08bece1879c

1 0

[pacman-dev] french man pages for pacman 3
by marc[i1] 01 Jun '07

01 Jun '07

Hello, I translate pacman man pages, I make a PKGBUILD in AUR for french people who does not want to read in english. http://aur.archlinux.org/packages.php?do_Details=1&ID=11180 I ask here if some dev wants to add those man pages on pacman. Thanks. -- + - - - - - - - - - - - - - - - - - - - + + (o< -! marc[i1] #363392 + + //\ http://poiroud.free.fr/dotclear + + \\/_ Linux for Free Generation + + - - - - - - - - - - - - - - - - - - - +

2 1

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-157-g6d69103
by Dan McGee 31 May '07

31 May '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 6d6910388e972d47df6a7a4268cd319e0aaba6d4 (commit) via 6d649473fa62726d783081025318f5add307b2d6 (commit) via af888c534b7c106ba89069ef6b11ea63d9f24975 (commit) from e422b71a48c9f7637595c510d8766f0f38b1114e (commit) - Log ----------------------------------------------------------------- commit 6d6910388e972d47df6a7a4268cd319e0aaba6d4 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 31 18:44:53 2007 -0400 Add Andrew to the authors list Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6d649473fa62726d783081025318f5add307b2d6 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu May 31 18:44:00 2007 -0400 FS7319: Add option to disable the inclusion of abs script. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit af888c534b7c106ba89069ef6b11ea63d9f24975 Author: VMiklos <vmiklos(a)frugalware.org> Date: Thu May 31 15:21:33 2007 -0400 alpm_parse_config(): ignore #.*$, not just ^#.*$ Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: AUTHORS | 1 + configure.ac | 16 ++++++++++++++++ etc/Makefile.am | 6 +++++- lib/libalpm/alpm.c | 3 +++ scripts/Makefile.am | 5 ++++- 5 files changed, 29 insertions(+), 2 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ e422b71a48c9f7637595c510d8766f0f38b1114e \ 6d6910388e972d47df6a7a4268cd319e0aaba6d4

1 0

[pacman-dev] pacman confused by provides, conflicts and depends
by Pierre Schmitz 31 May '07

31 May '07

Hi, I just found out something strange. The package php-suhosin (providing php) should be replaced by php. So I added "conflicts/replaces=php-suhosin" to php. When I try to upgrade I got the following error: --------------------------------------------------------------------- :: Starting full system upgrade... :: Replace php-suhosin with current/php? [Y/n] warning: kernel26-2.6.21.3-1: ignoring package upgrade (2.6.21.3-2) resolving dependencies... done. looking for inter-conflicts... done. error: failed to prepare transaction (could not satisfy dependencies) :: php-suhosin requires php-suhosin-extension --------------------------------------------------------------------- Strange, wether php-suhosin nor php-suhosin-extension depend on each other. The extension just needs php (which was provided by php-suhosin). So I just wonder why this upgrade fails. -- Pierre Schmitz Clemens-August-Straße 76 53115 Bonn Telefon 0228 9716608 Mobil 0160 95269831 Jabber pierre(a)jabber.archlinux.de WWW http://www.archlinux.de

1 0

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-154-ge422b71
by Dan McGee 31 May '07

31 May '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via e422b71a48c9f7637595c510d8766f0f38b1114e (commit) via 139d3c5e99fa6cb28fba7883123891a73fbb2421 (commit) from 7bd2ff685188d0d9b6ab6c6f43f6d28811936881 (commit) - Log ----------------------------------------------------------------- commit e422b71a48c9f7637595c510d8766f0f38b1114e Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu May 31 17:21:37 2007 +0100 Add autotool substitution for SRCEXT. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 139d3c5e99fa6cb28fba7883123891a73fbb2421 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu May 31 17:13:25 2007 +0100 Autotool fixes/cleanup. * configure.ac: Add AC_SUBST() for ROOTDIR, PKGEXT, DBEXT so they get exported to Makefiles. * {makepkg,pacman}.conf.in: Remove extra / from paths. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> ----------------------------------------------------------------------- Diffstat: configure.ac | 12 ++++++++++++ etc/Makefile.am | 1 + etc/makepkg.conf.in | 3 ++- etc/pacman.conf.in | 12 ++++++------ scripts/makepkg.in | 4 ++-- 5 files changed, 23 insertions(+), 9 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 7bd2ff685188d0d9b6ab6c6f43f6d28811936881 \ e422b71a48c9f7637595c510d8766f0f38b1114e

1 0

[pacman-dev] git snapshot
by Andrew Fyfe 31 May '07

31 May '07

For anyone that's interested I'm uploading daily snapshots of bleeding edge pacman source to http://linux.neptune-one.net/pacman/pacman-git.tar.bz2, it's updated everyday at 6:10am (UTC). Andrew

1 0

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-152-g7bd2ff6
by Dan McGee 31 May '07

31 May '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 7bd2ff685188d0d9b6ab6c6f43f6d28811936881 (commit) from 722db4535ae6690d8834ffebf3a0de3a880188f9 (commit) - Log ----------------------------------------------------------------- commit 7bd2ff685188d0d9b6ab6c6f43f6d28811936881 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 31 02:51:28 2007 -0400 Move DB and cache dirs away from there dependence on ROOTDIR This change allows us to use all autoconf specified paths, most notably $(localstatedir). It is quite a change and touches a lot of files, as all references to the DB and cache were done with the ROOTDIR as a prefix. * add --lock command-line option to pacman to specify the location of the lockfile (this can now be specified at configure time by setting the $localstatedir path). * Rip quite a few settings out of configure.ac as they are now picked by setting the paths during configure or make. * Fix bug with /tmp fallback for sync downloads not working correctly (related to root location, now the system tmp dir is used). * Simplified the parameters to some libalpm functions, and added get/set for the new lockfile option. * Renamed several of the DEFS to names without the PM_ prefix. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: configure.ac | 62 +++++++++------------------------------------- lib/libalpm/Makefile.am | 12 +++++++- lib/libalpm/alpm.c | 30 ++++++++++------------- lib/libalpm/alpm.h | 3 ++ lib/libalpm/db.c | 18 ++++++++----- lib/libalpm/db.h | 2 +- lib/libalpm/handle.c | 19 +++++++++++--- lib/libalpm/handle.h | 1 + lib/libalpm/md5driver.c | 2 +- lib/libalpm/package.c | 6 ++-- lib/libalpm/server.c | 2 +- lib/libalpm/sync.c | 27 ++++++++++---------- lib/libalpm/util.c | 6 +++- lib/libalpm/util.h | 4 +- pactest/pmtest.py | 9 +++++- pactest/util.py | 2 +- src/pacman/Makefile.am | 10 ++++++- src/pacman/add.c | 3 +- src/pacman/callback.c | 2 +- src/pacman/pacman.c | 20 ++++++++++---- src/pacman/query.c | 5 ++- src/pacman/remove.c | 3 +- src/pacman/sync.c | 29 ++++++++------------- src/pacman/util.c | 4 +- src/pacman/util.h | 4 +- 25 files changed, 142 insertions(+), 143 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 722db4535ae6690d8834ffebf3a0de3a880188f9 \ 7bd2ff685188d0d9b6ab6c6f43f6d28811936881

1 0

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-151-g722db45
by Dan McGee 31 May '07

31 May '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 722db4535ae6690d8834ffebf3a0de3a880188f9 (commit) from cad44221c811af0c528589bd087531f8ece6257e (commit) - Log ----------------------------------------------------------------- commit 722db4535ae6690d8834ffebf3a0de3a880188f9 Author: Dan McGee <dan(a)archlinux.org> Date: Thu May 31 01:12:17 2007 -0400 Set an error exit status on -Qi or -Si failure Regression from 2.9.8 where a failed -Qi lookup did not return an error on exit. The exit status is now incremented for each error encountered. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: src/pacman/query.c | 28 +++++++++++----------------- src/pacman/sync.c | 5 ++++- 2 files changed, 15 insertions(+), 18 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ cad44221c811af0c528589bd087531f8ece6257e \ 722db4535ae6690d8834ffebf3a0de3a880188f9

1 0

[pacman-dev] [GIT] pacman branch, master now at R_3_0_0-150-gcad4422
by Aaron Griffin 31 May '07

31 May '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via cad44221c811af0c528589bd087531f8ece6257e (commit) via a8c552d4770b50da1ed6248000392ac28fe17950 (commit) from 2ef1c8416f99ae62dc9e6d570ccbaefcc6fc3eed (commit) - Log ----------------------------------------------------------------- commit cad44221c811af0c528589bd087531f8ece6257e Author: Dale Ogilvie <pnyli0002(a)sneakemail.com> Date: Wed May 30 11:50:42 2007 +0100 Clean up variable usage in create_xdelta() and add a check for the xdelta program. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit a8c552d4770b50da1ed6248000392ac28fe17950 Author: Dale Ogilvie <pnyli0002(a)sneakemail.com> Date: Wed May 30 11:48:18 2007 +0100 Add support for creating xdeltas in makepkg. Add xdelta option to makepkg.conf Added xfer script to contrib. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> ----------------------------------------------------------------------- Diffstat: contrib/wget-xdelta.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++++ etc/makepkg.conf.in | 2 +- scripts/makepkg.in | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 2ef1c8416f99ae62dc9e6d570ccbaefcc6fc3eed \ cad44221c811af0c528589bd087531f8ece6257e

1 0