January 2010 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] zsh_completion: Add proper completion for --ignore and --ignoregroup (v2)
by Nezmer 20 Jan '10

20 Jan '10

This patch provides proper comma-separated completions for --ignore and --ignoregroup Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> --- contrib/zsh_completion | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 2f43d9b..b751c82 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -86,9 +86,9 @@ _pacman_opts_sync_modifiers=( '-w[Download packages only]' '-y[Download fresh package databases]' '*--ignore[Ignore a package upgrade]:package: - _pacman_completions_all_packages' - '*--ignoregroup[Ignore a group upgrade]:package group: - _pacman_completions_all_groups' + _pacman_completions_ignore_packages' + '*--ignoregroup[Ignore a group upgrade]:group: + _pacman_completions_ignore_groups' '--asdeps[Install packages as non-explicitly installed]' '--asexplicit[Install packages as explicitly installed]' ) @@ -240,6 +240,26 @@ _pacman_completions_all_packages() { fi } +# provides comma-separated completions for packages available from repositories +# to be used with --ignore +_pacman_completions_ignore_packages() { + local -a cmd packages + _pacman_get_command + packages=($(pacman -Slq)) + typeset -U packages + _wanted packages expl "packages" _values -s "," compadd - "${(@)packages}" +} + +# provides comma-separated completions for package groups to be used +# with --ignoregroup +_pacman_completions_ignore_groups() { + local -a cmd groups + _pacman_get_command + groups=($(pacman -Sg)) + typeset -U groups + _wanted groups expl "groups" _values -s "," compadd - "${(@)groups}" +} + # provides completions for package groups _pacman_completions_installed_groups() { local -a cmd groups -- 1.6.5.6

3 2

[pacman-dev] [PATCH] Show used/freed space when syncing
by Hugo Chargois 20 Jan '10

20 Jan '10

Shows the "Total Used/Freed Size" after "Total Download Size" and "Total Installed Size" when syncing packages. It is the difference of installation size between packages to be updated and the installation size of the older version of these packages on disk. For exemple, if uploading to a new version of a package that has an installed size of 60 and the old version has an installed size of 50, this will show 10. Negative numbers represent space actually freed. Signed-off-by: Hugo Chargois <hugo.chargois(a)free.fr> --- src/pacman/util.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 14a0f6c..3b4a695 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -44,6 +44,7 @@ #include "conf.h" #include "callback.h" +extern pmdb_t db_local; int trans_init(pmtransflag_t flags) { @@ -498,8 +499,8 @@ void display_targets(const alpm_list_t *pkgs, int install) { char *str; const alpm_list_t *i; - off_t isize = 0, dlsize = 0; - double mbisize = 0.0, mbdlsize = 0.0; + off_t isize = 0, dlsize = 0, localsize = 0; + double mbisize = 0.0, mbdlsize = 0.0, mdeltasize = 0.0; alpm_list_t *targets = NULL; if(!pkgs) { @@ -510,8 +511,14 @@ void display_targets(const alpm_list_t *pkgs, int install) for(i = pkgs; i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); + char *name = alpm_pkg_get_name(pkg); + pmpkg_t *local_pkg = alpm_db_get_pkg(db_local, name); + dlsize += alpm_pkg_download_size(pkg); isize += alpm_pkg_get_isize(pkg); + if (local_pkg != NULL){ + localsize += alpm_pkg_get_isize(local_pkg); + } /* print the package size with the output if ShowSize option set */ if(config->showsize) { @@ -527,9 +534,10 @@ void display_targets(const alpm_list_t *pkgs, int install) targets = alpm_list_add(targets, str); } - /* Convert byte sizes to MB */ + /* Convert byte sizes to MB and calculate delta size*/ mbdlsize = dlsize / (1024.0 * 1024.0); mbisize = isize / (1024.0 * 1024.0); + mdeltasize = (isize - localsize) / (1024.0 * 1024.0); if(install) { asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); @@ -539,6 +547,7 @@ void display_targets(const alpm_list_t *pkgs, int install) printf(_("Total Download Size: %.2f MB\n"), mbdlsize); printf(_("Total Installed Size: %.2f MB\n"), mbisize); + printf(_("Total Size Used/Freed: % .2f MB\n"), mdeltasize); } else { asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); list_display(str, targets); -- 1.6.3.3

5 9

[pacman-dev] [PATCH] makepkg: add option holdver (like --holdver arg)
by Vesa Kaihlavirta 20 Jan '10

20 Jan '10

From: Vesa Kaihlavirta <vegai(a)iki.fi> Signed-off-by: Vesa Kaihlavirta <vegai(a)iki.fi> --- scripts/makepkg.sh.in | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5bbd880..78b1e22 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,7 +44,7 @@ startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') +packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'holdver' 'purge') other_options=('ccache' 'distcc' 'makeflags' 'force') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ @@ -1269,12 +1269,13 @@ check_sanity() { devel_check() { newpkgver="" - # Do not update pkgver if --holdver is set, when building a source package, repackaging, - # reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w) - if (( HOLDVER || SOURCEONLY || REPKG )) \ - || [[ ! -f $BUILDFILE || ! -w $BUILDFILE ]]; then - return - fi + # Do not update pkgver if --holdver is set, holdver option is set, when building a + # source package, when reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w) + if [ "$HOLDVER" -eq 1 -o "$(check_option holdver)" = "y" \ + -o "$SOURCEONLY" -ne 0 -o ! -f "$BUILDFILE" \ + -o ! -w "$BUILDFILE" ]; then + return + fi if [[ -z $FORCE_VER ]]; then # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. -- 1.6.6

3 5

[pacman-dev] [PATCH] Remove setgid bit on srcdir/pkgdir creation
by Dan McGee 20 Jan '10

20 Jan '10

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> --- scripts/makepkg.sh.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5bd294c..c2045e5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1056,6 +1056,7 @@ create_srcpackage() { # Get back to our src directory so we can begin with sources. mkdir -p "$srcdir" + chmod a-s "$srcdir" cd "$srcdir" download_sources # We can only check checksums if we have all files. @@ -1725,6 +1726,7 @@ fi if (( GENINTEG )); then mkdir -p "$srcdir" + chmod a-s "$srcdir" cd "$srcdir" download_sources generate_checksums @@ -1824,6 +1826,7 @@ if (( INFAKEROOT )); then for pkg in ${pkgname[@]}; do pkgdir="$pkgdir/$pkg" mkdir -p "$pkgdir" + chmod a-s "$pkgdir" backup_package_variables run_package $pkg tidy_install @@ -1880,6 +1883,7 @@ umask 0022 # get back to our src directory so we can begin with sources mkdir -p "$srcdir" +chmod a-s "$srcdir" cd "$srcdir" if (( NOEXTRACT )); then @@ -1915,6 +1919,7 @@ else rm -rf "$pkgdir" fi mkdir -p "$pkgdir" + chmod a-s "$pkgdir" cd "$startdir" # if we are root or if fakeroot is not enabled, then we don't use it @@ -1935,6 +1940,7 @@ else for pkg in ${pkgname[@]}; do pkgdir="$pkgdir/$pkg" mkdir -p "$pkgdir" + chmod a-s "$pkgdir" backup_package_variables run_package $pkg tidy_install -- 1.6.6

3 4

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.3-5-g8b3f5f0
by dan＠archlinux.org 20 Jan '10

20 Jan '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, maint has been updated via 8b3f5f0ce6dca98ca14cc48f5a85188313769b40 (commit) via ce9bb994f86f9653dc293f2dda0f8f2160964090 (commit) via 0c3f5020645ab5ab28113322e33abdeeb2b34a63 (commit) via a12ed63545ee16d37da2b28bbf4c1820bd367315 (commit) from 335627d72dd5e51201b4cd53d84b70954946c013 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: contrib/bacman | 4 ++-- contrib/bash_completion | 28 ++++++++++++++-------------- lib/libalpm/alpm.c | 1 + scripts/makepkg.sh.in | 7 ++++--- 4 files changed, 21 insertions(+), 19 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-121-g0eadc99
by dan＠archlinux.org 20 Jan '10

20 Jan '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 0eadc992400aaad58da5866d23caee01a22e1341 (commit) via 8b3f5f0ce6dca98ca14cc48f5a85188313769b40 (commit) via ce9bb994f86f9653dc293f2dda0f8f2160964090 (commit) via 0c3f5020645ab5ab28113322e33abdeeb2b34a63 (commit) via a12ed63545ee16d37da2b28bbf4c1820bd367315 (commit) via afc37c58c74848a11adb04b0ae182cca467cd25e (commit) via 335627d72dd5e51201b4cd53d84b70954946c013 (commit) from a6cca6e456e9b84362e00b5e5209059a20df965c (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 0eadc992400aaad58da5866d23caee01a22e1341 Merge: afc37c58c74848a11adb04b0ae182cca467cd25e 8b3f5f0ce6dca98ca14cc48f5a85188313769b40 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 19 22:03:54 2010 -0600 Merge branch 'maint' Just a slight touchup in makepkg due to the [ -> [[ conversion, so nothing to see here. Conflicts: scripts/makepkg.sh.in commit afc37c58c74848a11adb04b0ae182cca467cd25e Author: Nezmer <git(a)nezmer.info> Date: Tue Jan 19 20:05:06 2010 +0200 makepkg: Introduce $SRCPKGDEST Introduce $SRCPKGDEST to define a destination dir for source packages instead of saving them in $PKGDEST with binary packages. The simple patch doesn't break old behavior. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/makepkg.conf.in | 2 ++ lib/libalpm/alpm.c | 1 + scripts/makepkg.sh.in | 7 +++++-- 3 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Print "there is nothing to do" with NOOP transactions
by Nagy Gabor 19 Jan '10

19 Jan '10

The "local database is up to date" message has been replaced with "there is nothing to do" message. This used with "empty" -S, -R, -U operations too. (Examples: pacman -S ignored_pkg, pacman -Ru needed_pkg.) See FS#17859. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- src/pacman/remove.c | 1 + src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 6d44350..61b57c7 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -118,6 +118,7 @@ int pacman_remove(alpm_list_t *targets) /* Step 3: actually perform the removal */ alpm_list_t *pkglist = alpm_trans_get_remove(); if(pkglist == NULL) { + printf(_(" there is nothing to do\n")); goto cleanup; /* we are done */ } /* print targets and ask user confirmation */ diff --git a/src/pacman/sync.c b/src/pacman/sync.c index a2ef616..24acf5f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -663,7 +663,7 @@ static int sync_trans(alpm_list_t *targets) packages = alpm_trans_get_add(); if(packages == NULL) { /* nothing to do: just exit without complaining */ - printf(_(" local database is up to date\n")); + printf(_(" there is nothing to do\n")); goto cleanup; } diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 57c7b79..ddb4796 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -132,6 +132,7 @@ int pacman_upgrade(alpm_list_t *targets) /* print targets and ask user confirmation */ alpm_list_t *packages = alpm_trans_get_add(); if(packages == NULL) { /* we are done */ + printf(_(" there is nothing to do\n")); trans_release(); return(retval); } -- 1.6.6

1 0

[pacman-dev] [PATCH] Show used/freed space when syncing (FR FS#12566)
by Hugo Chargois 11 Jan '10

11 Jan '10

Shows the "Total Used/Freed Size" after "Total Download Size" and "Total Installed Size" when syncing packages. It is the difference of installation size between packages to be updated and the installation size of the older version of these packages on disk. For exemple, if uploading to a new version of a package that has an installed size of 60 and the old version has an installed size of 50, this will show 10. Negative numbers represent space actually freed. Signed-off-by: Hugo Chargois <hugo.chargois(a)free.fr> --- src/pacman/util.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 14a0f6c..e1e0064 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -44,6 +44,7 @@ #include "conf.h" #include "callback.h" +extern pmdb_t db_local; int trans_init(pmtransflag_t flags) { @@ -498,8 +499,8 @@ void display_targets(const alpm_list_t *pkgs, int install) { char *str; const alpm_list_t *i; - off_t isize = 0, dlsize = 0; - double mbisize = 0.0, mbdlsize = 0.0; + off_t isize = 0, dlsize = 0, localsize = 0; + double mbisize = 0.0, mbdlsize = 0.0, mbdeltasize = 0.0; alpm_list_t *targets = NULL; if(!pkgs) { @@ -510,8 +511,14 @@ void display_targets(const alpm_list_t *pkgs, int install) for(i = pkgs; i; i = alpm_list_next(i)) { pmpkg_t *pkg = alpm_list_getdata(i); + char *name = alpm_pkg_get_name(pkg); + pmpkg_t *local_pkg = alpm_db_get_pkg(db_local, name); + dlsize += alpm_pkg_download_size(pkg); isize += alpm_pkg_get_isize(pkg); + if(local_pkg != NULL){ + localsize += alpm_pkg_get_isize(local_pkg); + } /* print the package size with the output if ShowSize option set */ if(config->showsize) { @@ -527,9 +534,10 @@ void display_targets(const alpm_list_t *pkgs, int install) targets = alpm_list_add(targets, str); } - /* Convert byte sizes to MB */ + /* Convert byte sizes to MB and calculate delta size*/ mbdlsize = dlsize / (1024.0 * 1024.0); mbisize = isize / (1024.0 * 1024.0); + mbdeltasize = (isize - localsize) / (1024.0 * 1024.0); if(install) { asprintf(&str, _("Targets (%d):"), alpm_list_count(targets)); @@ -539,6 +547,7 @@ void display_targets(const alpm_list_t *pkgs, int install) printf(_("Total Download Size: %.2f MB\n"), mbdlsize); printf(_("Total Installed Size: %.2f MB\n"), mbisize); + printf(_("Total Size Used/Freed: % .2f MB\n"), mbdeltasize); } else { asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); list_display(str, targets); -- 1.6.3.3

1 0

[pacman-dev] Humble proposal: replace autotools by CMake for pacman
by Yannick LM 09 Jan '10

09 Jan '10

Hi, First of all, since it's my first message on this list, a few words about myself: I'm a French software engineer in a small company, I've use Arch from several years now, and CMake at work. (We produce a big piece of software written in C++ that must run on windows, linux and mac) I'm also a huge fan of the Python language. Also, a few words about cmake: Web page: http://www.cmake.org/ Typical workflow is: cd /path/to/source mkdir build cd build cmake .. ccmake . #optional, to change configuration make Pros : * Nothing gets generated anywhere but in source/build, so there's no need for "clean" rules and a .gitignore containing "build" is enough :) * It's widely used, so lots of stuff such as using gettext is easily done. * It's fast! (written in C++) Cons: * It has a ugly syntax * It lacks decent documentation: http://cmake.org/cmake/help/cmake-2-8-docs.html is all you've got. Back to the subject: one day I decided it would be great to see libalpm wrapped in Python (or Ruby, or whatever ...) It's quite easy done once you use swig, and swig is easy when you use cmake. So, I started hacking a few CMakeLists files. The result is in a "cmake" branch in git://sd-5791.dedibox.fr/prog/pacman.git (which I'll try to keep not too far from pacman's official master branch) Right now, here's what those files can do: * let the user choose a few variables such as CONFFILE, DBEXT, LOGFILE (using ccmake) * build libalpm and pacman * install some files. If you want, I could take care of everything that's still missing: documentation, translations, tests ... I don't have much spare time to spend on this, but there's no need to hurry, isn't it? Just let me know if you are interested or if you have any question on the subject. Cheers, Yannick LM

3 3

[pacman-dev] Parsing variables in PKGBUILD packaging functions.
by Xyne 06 Jan '10

06 Jan '10

Hi, Is there any way to _unequivocally_ parse PKGBUILD variables within a "package" function, e.g. "depends", without executing the entire code block? Please tell me that you don't actually need to build the package(s) to get all of the variables. Thanks, Xyne *holds breath and hopes*

2 2