- Pacman-dev - lists.archlinux.org

[pacman-dev] Handling splitpkg overrides in scripts
by Allan McRae 27 Dec '09

27 Dec '09

This is the start of what will be a makepkg test suite. It shows a (somewhat robust?) method of parsing splitpkg overrides so will be of use when updating db-scripts to handle splitpkg's with different arch/pkgrel/pkgver's (which can be overrided in pacman-git now). It extracts the "package_foo()" function with a sed statements that assumes that it starts at the start of the line and the closing "}" is the only thing on its line (could be made more robust...). Then is extracts the various variables using a grep. It can handle the following syntax: foo=1 foo=STRING foo="ABC DEF" for=('a' 'b' \ 'c' ) which is basically everything... Any comments on how to improve this are welcome. Allan #!/bin/bash splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ 'backup' 'options' 'install' 'changelog') readonly -a splitpkg_overrides backup_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" eval "${indirect}=(\"\${$var[@]}\")" done } restore_package_variables() { for var in ${splitpkg_overrides[@]}; do indirect="${var}_backup" if [[ -n ${!indirect} ]]; then eval "${var}=(\"\${$indirect[@]}\")" else unset ${var} fi done } parse_splitpkg_overrides() { if grep -q "package_$1()" PKGBUILD; then pkgfunc=$(sed -n "/^package_$1/,/^}/p" PKGBUILD) for var in ${splitpkg_overrides[@]}; do eval $(echo $pkgfunc | grep -Eo "$var=(\"[^)]*\"|$[^)]*$|[^ ]*)") done fi } ## # Checks if all packages are created - does not work yet... :P ## pkg_exists() { # get package arch if [[ $arch != "any" ]]; then arch=$CARCH fi for pkg in ${pkgname[@]}; do # check for package specific overrides backup_package_variables parse_splitpkg_overrides $pkg echo $pkg-$pkgver-$pkgrel-$arch$PKGEXT restore_package_variables done } source /etc/makepkg.conf source PKGBUILD pkg_exists

1 0

[pacman-dev] [PATCH] Do not print installed size when only downloading
by Allan McRae 23 Dec '09

23 Dec '09

When using --downloadonly the "Total Installed Size" message is not needed and perhaps misleading. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/util.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 14a0f6c..d237d00 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -538,7 +538,9 @@ void display_targets(const alpm_list_t *pkgs, int install) printf("\n"); printf(_("Total Download Size: %.2f MB\n"), mbdlsize); - printf(_("Total Installed Size: %.2f MB\n"), mbisize); + if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY)) { + printf(_("Total Installed Size: %.2f MB\n"), mbisize); + } } else { asprintf(&str, _("Remove (%d):"), alpm_list_count(targets)); list_display(str, targets); -- 1.6.5.6

1 0

[pacman-dev] [PATCH] Allow -Qo to perform a functional 'which'
by Allan McRae 23 Dec '09

23 Dec '09

When pacman queries the ownership of an object that is not a path, it will check in the users PATH for a match. Implements FS#8798. Patch-by: Shankar <jatheendra(a)gmail.com> [Allan: rework for master, tidy-up] Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This was original posted a year ago... http://mailman.archlinux.org/pipermail/pacman-dev/2008-November/007659.html The comments then were that we should maybe refactor out stuff dealing with file paths, specifically removing trailing backslashes. That appears to only occur in two other places and is very simple so I do not thing it needs refactored and can be done in a spearate patch if necessary. The only other part I do not like is the "failed to read file" error block is repeated, but I can not see a nice way to fix that. src/pacman/query.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 6b6a25d..6f579fd 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -56,6 +56,41 @@ static char *resolve_path(const char* file) return(str); } +/* check if filename exists in PATH */ +static int search_path(char *filename, struct stat * bufptr) +{ + char *envpath, *path, *fullname; + int len; + + if ((envpath = getenv("PATH")) == NULL) { + return(-1); + } + if ((envpath = strdup(envpath)) == NULL) { + return(-1); + } + + fullname = calloc(PATH_MAX+1, sizeof(char)); + + while ((path = strsep(&envpath, ":")) != NULL) { + len = strlen(path); + + /* strip the trailing slash if one exists */ + if(path[len - 1] == '/') { + path[len - 1] = '\0'; + } + + snprintf(fullname, PATH_MAX+1, "%s/%s", path, filename); + + if(stat(fullname, bufptr) == 0) { + strncpy(filename, fullname, PATH_MAX+1); + free(fullname); + return(0); + } + } + free(fullname); + return(-1); +} + static int query_fileowner(alpm_list_t *targets) { int ret = 0; @@ -67,19 +102,31 @@ static int query_fileowner(alpm_list_t *targets) return(1); } + char *filename = calloc(PATH_MAX+1, sizeof(char)); + for(t = targets; t; t = alpm_list_next(t)) { int found = 0; - char *filename = alpm_list_getdata(t); + strncpy(filename, alpm_list_getdata(t), PATH_MAX+1); char *bname, *dname, *rpath; const char *root; struct stat buf; alpm_list_t *i, *j; if(lstat(filename, &buf) == -1) { - pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), - filename, strerror(errno)); - ret++; - continue; + /* if it is not a path but a program name, then check in PATH */ + if(strchr(filename, '/') == NULL) { + if(search_path(filename, &buf) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } + } else { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } } if(S_ISDIR(buf.st_mode)) { @@ -140,6 +187,7 @@ static int query_fileowner(alpm_list_t *targets) free(rpath); } + free(filename); return ret; } -- 1.6.5.6

3 8

[pacman-dev] [PATCH] makepkg: make strip options configurable
by Cedric Staniewski 21 Dec '09

21 Dec '09

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> --- configure.ac | 9 +++++++++ doc/Makefile.am | 14 ++++++++++++-- doc/makepkg.conf.5.txt | 12 ++++++++++++ etc/Makefile.am | 3 +++ etc/makepkg.conf.in | 6 ++++++ scripts/makepkg.sh.in | 6 +++--- 6 files changed, 45 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 80e41a6..faf774f 100644 --- a/configure.ac +++ b/configure.ac @@ -186,6 +186,9 @@ GCC_GNU89_INLINE_CC # Host-dependant definitions SIZECMD="stat -L -c %s" SEDINPLACE="sed -i" +STRIP_BINARIES="--strip-all" +STRIP_SHARED="--strip-unneeded" +STRIP_STATIC="--strip-debug" case "${host_os}" in *bsd*) SIZECMD="stat -L -f %z" @@ -199,6 +202,9 @@ case "${host_os}" in host_os_darwin=yes SIZECMD="/usr/bin/stat -L -f %z" SEDINPLACE="/usr/bin/sed -i ''" + STRIP_BINARIES="" + STRIP_SHARED="-S" + STRIP_STATIC="-S" ;; esac @@ -206,6 +212,9 @@ AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) +AC_SUBST(STRIP_BINARIES) +AC_SUBST(STRIP_SHARED) +AC_SUBST(STRIP_STATIC) # Check for architecture, used in default makepkg.conf # (Note single space left after CARCHFLAGS) diff --git a/doc/Makefile.am b/doc/Makefile.am index fcbcab8..ce1adab 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -66,6 +66,12 @@ else REAL_PACKAGE_VERSION = $(PACKAGE_VERSION) endif +#### Taken from the autoconf scripts Makefile.am #### +edit = sed \ + -e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \ + -e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \ + -e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g' + man_MANS = dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8 @@ -93,8 +99,12 @@ A2X_OPTS = \ --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0' # These rules are due to the includes and files of the asciidoc text -$(ASCIIDOC_MANS): asciidoc.conf footer.txt - a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt +$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile + @echo GEN $@; + @rm -f $@.tmp + @test -f $(srcdir)/$@.txt && $(edit) $(srcdir)/$@.txt >$@.tmp || true + a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.tmp + @rm -f $@.tmp %.html: %.txt asciidoc $(ASCIIDOC_OPTS) -a linkcss $*.txt diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 88c4cbb..359db68 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -135,6 +135,18 @@ Options affects both generation and checking. The current valid options are: `md5`, `sha1`, `sha256`, `sha384`, and `sha512`. +**STRIP_BINARIES=**"@STRIP_BINARIES@":: + Options to be used when stripping binaries. See `strip''s man page + for details. + +**STRIP_SHARED=**"@STRIP_SHARED@":: + Options to be used when stripping shared libraries. See `strip''s + man page for details. + +**STRIP_STATIC=**"@STRIP_STATIC@":: + Options to be used when stripping static libraries. See `strip''s + man page for details. + **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: If `zipman` is specified in the OPTIONS array, this variable will instruct makepkg where to look to compress manual (man and info) diff --git a/etc/Makefile.am b/etc/Makefile.am index 55c28c3..25f1834 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -13,6 +13,9 @@ edit = sed \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ -e 's|@PKGEXT[@]|$(PKGEXT)|g' \ -e 's|@SRCEXT[@]|$(SRCEXT)|g' \ + -e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \ + -e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \ + -e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g' \ -e 's|@CARCH[@]|$(CARCH)|g' \ -e 's|@CHOST[@]|$(CHOST)|g' \ -e 's|@ARCHSWITCH[@]|$(ARCHSWITCH)|g' \ diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 3a3a415..032a7fc 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -72,6 +72,12 @@ OPTIONS=(strip docs libtool emptydirs zipman purge) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="@STRIP_BINARIES@" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="@STRIP_SHARED@" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="@STRIP_STATIC@" #-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) #-- Doc directories to remove (if !docs is specified) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0688e7c..e2d6cef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -853,11 +853,11 @@ tidy_install() { *compressed-encoding*) # Skip compressed binaries ;; *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip -S "$binary";; + /usr/bin/strip $STRIP_SHARED "$binary";; *application/x-archive*) # Libraries (.a) - /usr/bin/strip -S "$binary";; + /usr/bin/strip $STRIP_STATIC "$binary";; *application/x-executable*) # Binaries - /usr/bin/strip "$binary";; + /usr/bin/strip $STRIP_BINARIES "$binary";; esac done fi -- 1.6.5.6

2 5

Re: [pacman-dev] [arch-dev-public] doc size
by Xavier 18 Dec '09

18 Dec '09

On Wed, Dec 16, 2009 at 11:07 PM, Xavier <shiningxc(a)gmail.com> wrote: > > The results are slightly different, mostly because makepkg > overestimates uncompressed size by not using -a with du, while namcap > lotsofdocs computes the real size. > > Now that I think about it, maybe the trick/hack I used in my first > script would actually be a portable way to get the real uncompressed > size : > bsdtar tvf foo.pkg.tar.gz 2>/dev/null | awk '{ SUM += $5 } END { print SUM }' > > But this is offtopic, I should find again the makepkg bug report we > had about this that we probably rejected :P > http://bugs.archlinux.org/task/11225 I see, so we made a patch for repo-add : http://bugs.archlinux.org/task/11225?getfile=2429 I also made one for makepkg : http://bugs.archlinux.org/task/11225?getfile=2426 But Dan rejected it with this reason : "Note that I did not touch makepkg because our size there is not critical- a size to the nearest K is just fine, and switching to a find/stat way of doing it would cause all hard links to get double-counted." It is a size to the nearest K for each file, and we accumulate the errors ? I did not realize the difference was so big until today, when playing with docsize stuff. e.g. for libsigc++-2.0 : du -s = 12040 K du -s --apparent-size = 10723 K So that's 1300K. and 12% error if I am not mistaken.

2 3

[pacman-dev] [PATCH 1/2] callback.c : less magic progress bars
by Xavier Chantry 16 Dec '09

16 Dec '09

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> --- src/pacman/callback.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 15f5423..a40a702 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -90,20 +90,20 @@ static float get_update_timediff(int first_call) static void fill_progress(const int bar_percent, const int disp_percent, const int proglen) { - const unsigned int hashlen = proglen - 8; - const unsigned int hash = bar_percent * hashlen / 100; - static unsigned int lasthash = 0, mouth = 0; - unsigned int i; + /* 8 = 1 space + 1 [ + 1 ] + 5 for percent */ + const int hashlen = proglen - 8; + const int hash = bar_percent * hashlen / 100; + static int lasthash = 0, mouth = 0; + int i; if(bar_percent == 0) { lasthash = 0; mouth = 0; } - /* magic numbers, how I loathe thee */ - if(proglen > 8) { + if(hashlen > 0) { printf(" ["); - for(i = hashlen; i > 1; --i) { + for(i = hashlen; i > 0; --i) { /* if special progress bar enabled */ if(config->chomp) { if(i > hashlen - hash) { @@ -139,7 +139,8 @@ static void fill_progress(const int bar_percent, const int disp_percent, printf("]"); } /* print display percent after progress bar */ - if(proglen > 5) { + /* 5 = 1 space + 3 digits + 1 % */ + if(proglen >= 5) { printf(" %3d%%", disp_percent); } @@ -376,7 +377,7 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, ++digits; } /* determine room left for non-digits text [not ( 1/12) part] */ - textlen = infolen - 3 - (2 * digits); + textlen = infolen - 3 /* (/) */ - (2 * digits) - 1 /* space */; /* In order to deal with characters from all locales, we have to worry * about wide characters and their column widths. A lot of stuff is @@ -451,7 +452,8 @@ void cb_dl_total(off_t total) void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) { const int infolen = 50; - const int filenamelen = infolen - 27; + /* explanation of magic 28 number at the end */ + const int filenamelen = infolen - 28; char *fname, *p; /* used for wide character width determination and printing */ int len, wclen, wcwid, padwid; @@ -613,6 +615,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) } } + /* 1 space + filenamelen + 1 space + 7 for size + 1 + 7 for rate + 2 for /s + 1 space + 8 for eta */ printf(" %ls%-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", wcfname, padwid, "", f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); -- 1.6.5.6

1 1

[pacman-dev] [PATCH] zsh_completion: Add proper completion for --ignore and --ignoregroup
by Nezmer 15 Dec '09

15 Dec '09

This patch provides proper comma-separated completions for --ignore and --ignoregroup Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> --- contrib/zsh_completion | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 2f43d9b..b27261f 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,29 @@ _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 repositories packages_long + + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + typeset -U repositories + packages_long=(/var/lib/pacman/sync/${^repositories}/*(/)) + packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + 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

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.3.3-1-g335627d
by dan＠archlinux.org 15 Dec '09

15 Dec '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 335627d72dd5e51201b4cd53d84b70954946c013 (commit) from e09253d15b879f3375d57efd656e687a984ebc36 (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 335627d72dd5e51201b4cd53d84b70954946c013 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Oct 21 16:06:42 2009 +0200 makepkg: check for non-empty pkgbase instead of pkgname pkgbase is used in the following rm calls, and since pkgname can be present when pkgbase is not, it is safer to check for pkgbase. 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> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] makepkg: move pacman calls to a function
by Cedric Staniewski 14 Dec '09

14 Dec '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- I'm not sure about that part pmout=$(run_pacman -T "$@") for two reasons. First, we have to work around sudo in run_pacman, and second, most of the pacman wrappers does not support -T or do not return the same codes as pacman does. For this second reason, the following patch would be (currently) useless for the majority of pacman wrapper users. scripts/makepkg.sh.in | 39 +++++++++++++++------------------------ 1 files changed, 15 insertions(+), 24 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fbcdc70..cfc5736 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -328,10 +328,21 @@ download_file() { fi } +run_pacman() { + local ret=0 + if (( ! ASROOT )) && [[ $1 != -T ]]; then + sudo pacman $PACMAN_OPTS "$@" || ret=$? + else + pacman $PACMAN_OPTS "$@" || ret=$? + fi + return $ret +} + check_deps() { [ $# -gt 0 ] || return - pmout=$(pacman $PACMAN_OPTS -T "$@") + local ret=0 + pmout=$(run_pacman -T "$@") ret=$? if [ $ret -eq 127 ]; then #unresolved deps echo "$pmout" @@ -356,15 +367,8 @@ handle_deps() { if [ "$DEP_BIN" -eq 1 ]; then # install missing deps from binary packages (using pacman -S) msg "$(gettext "Installing missing dependencies...")" - local ret=0 - - if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? - else - pacman $PACMAN_OPTS -S --asdeps $deplist || ret=$? - fi - if [ $ret -ne 0 ]; then + if ! run_pacman -S --asdeps $deplist; then error "$(gettext "Pacman failed to install missing dependencies.")" exit 1 # TODO: error code fi @@ -422,15 +426,9 @@ remove_deps() { done msg "Removing installed dependencies..." - local ret=0 - if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -Rns $deplist || ret=$? - else - pacman $PACMAN_OPTS -Rns $deplist || ret=$? - fi # Fixes FS#10039 - exit cleanly as package has built successfully - if [ $ret -ne 0 ]; then + if ! run_pacman -Rns $deplist; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi @@ -1113,14 +1111,7 @@ install_package() { fi done - local ret=0 - if [ "$ASROOT" -eq 0 ]; then - sudo pacman $PACMAN_OPTS -U ${pkglist} || ret=$? - else - pacman $PACMAN_OPTS -U ${pkglist} || ret=$? - fi - - if [ $ret -ne 0 ]; then + if ! run_pacman -U $pkglist; then warning "$(gettext "Failed to install built package(s).")" return 0 fi -- 1.6.5.2

4 41

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-114-ga6cca6e
by dan＠archlinux.org 14 Dec '09

14 Dec '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via a6cca6e456e9b84362e00b5e5209059a20df965c (commit) via 9fe27b068ae40a407fd5dd12f974d84499d41ef0 (commit) via 05ff276eefc51eeeee58832accd8398eac047037 (commit) via 66c6d288fd44b2f148860c7abbd1ed56b31a9238 (commit) via b805fe58ae8e762f2d663cb6416005521b76e182 (commit) via a2c9cbdbdc8ca1ad1653fa42eb4b7571bfe744ec (commit) via b8b8c78627b2f1791a2b46b0d6c87d7a9b90f376 (commit) via 51f9e5e40a7b4c9a2a4bb61562a07946adc2bb2d (commit) via 444ff9564195223e31d445459009fceb2ae79002 (commit) via e612eb6ba227104761b9c6fafe375c74267bba09 (commit) via 926dfe5827d13a38f02efb2da1d9ceab38e9fc16 (commit) via 03f35b1432675f5b10ec53945e48c2bbd7c628e9 (commit) from f2c9e51eb00edb2f3123bd150fd9944c765426e0 (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 a6cca6e456e9b84362e00b5e5209059a20df965c Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Dec 2 19:05:39 2009 +0100 makepkg: remove srclinks directory on error exit When makepkg exits in create_srcpackage(), the (temporary) srclinks directory is left behind. 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 9fe27b068ae40a407fd5dd12f974d84499d41ef0 Author: Nezmer <Nezmer(a)allurelinux.org> Date: Sat Dec 12 01:25:32 2009 +0200 makepkg: skip devel_check() when repackaging Currently, "makepkg -R" creates a package with a wrong updated $pkgver. Signed-off-by: Nezmer <Nezmer(a)allurelinux.org> [Allan: adjusted comment] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 05ff276eefc51eeeee58832accd8398eac047037 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Dec 2 19:04:33 2009 +0100 makepkg: limit sudo usage to allowed pacman commands This is particularly useful when using pacman wrappers which call sudo by themselves and therefore should not be run as root. 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 66c6d288fd44b2f148860c7abbd1ed56b31a9238 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Wed Dec 2 19:04:32 2009 +0100 makepkg: allow to specify an alternative pacman command If PACMAN environment variable is set, makepkg will try to use this command to check for installed dependencies and to install or remove packages. Otherwise, makepkg will fall back to pacman. Implements FS#13028. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Allan McRae <allan(a)archlinux.org> [Dan: move envvar section in manpage] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b805fe58ae8e762f2d663cb6416005521b76e182 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 25 13:57:20 2009 +1000 makepkg: check for references to build root in package Add a check that the package does not contain references to the folder it was built in. Fixes FS#14751 Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a2c9cbdbdc8ca1ad1653fa42eb4b7571bfe744ec Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Dec 9 23:20:29 2009 +0100 improve download_internal error messages download_internal is supposed to always set pm_errno but did not in many cases. The most important (and tested) change is the one concerning fetchStat. This is typically where the code will fail when the network is down for example. Before commit d2dbb04a9af7a18da, this fetchStat call did not exist and the same kind of errors would be encountered in the fetchXGet call that follows. I just copied the error printing to restore the old behavior. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8b8c78627b2f1791a2b46b0d6c87d7a9b90f376 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Dec 5 23:45:34 2009 +0100 add some more sanity check for optarg getopt should already ensure that optarg is not NULL when an argument is required, but just be extra safe and double check it before using optarg. To be honest, I only did that to make clang shut up and eliminate the last warnings it reported. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 51f9e5e40a7b4c9a2a4bb61562a07946adc2bb2d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Dec 5 23:20:53 2009 +0100 refactor _parseoptions This function was quite huge (~230 lines) and difficult to parse, now it is slightly better. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 444ff9564195223e31d445459009fceb2ae79002 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Nov 13 16:42:42 2009 +0100 Print error on duplicated database entries Some users reported duplicated database entries in /var/lib/pacman/local/, for example, both foo-1.0-1 and foo-2.0-1 subdirectories existed. (Bogus 3rd-party scripts, backup?) In this case pacman reported no error and its behaviour was mysterious. From now on, pacman detects this situation and prints an error message. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e612eb6ba227104761b9c6fafe375c74267bba09 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 13 23:12:44 2009 -0600 Remove trailing whitespace on all lines in list_display This ensures we never have trailing whitespace. Take the following text, with line numbers added for clarity: 1. Title : item1 item2 item3 item4 2. item5 item6 item7 item8 3. item9 itemA itemB itemC Laszlo Papp helpfully pointed out we would have two trailing spaces on line three after the last item. However, we also had these trailing spaces on lines one and two, which the initial patch didn't take care of. This can be seen on something like `pacman -Qi glibc`. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 926dfe5827d13a38f02efb2da1d9ceab38e9fc16 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 7 22:48:59 2009 -0600 Fix requiredby output This is a bit embarrassing. For example: $ pacman -Qi mesa ... Required By : mesa mesa mesa mesa mesa mesa Something is clearly not right, and the problem was introduced in commit 0bc961. Fix the issue by getting the package name off the correct variable. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 03f35b1432675f5b10ec53945e48c2bbd7c628e9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 30 22:56:44 2009 -0600 bash_completion: use absolute paths to utilities Fixes issues noted in FS#16630. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 28 ++-- doc/makepkg.8.txt | 9 ++ lib/libalpm/be_files.c | 7 + lib/libalpm/dload.c | 10 +- lib/libalpm/package.c | 2 +- scripts/makepkg.sh.in | 33 +++-- src/pacman/pacman.c | 324 +++++++++++++++++++++++++++-------------------- src/pacman/util.c | 10 +- 8 files changed, 251 insertions(+), 172 deletions(-) hooks/post-receive -- The official pacman repository

1 0