October 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add more logging to download code
by Dan McGee 24 Oct '11

24 Oct '11

This adds a logger to the CURLE_OK case so we can always know the return code if it was >= 400, and debug log it regardless. Also adjust another logger to use the cURL error message directly, as well as use fstat() when we have an open file handle rather than stat(). Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/dload.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index cd2857c..9d919b0 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -392,8 +392,15 @@ static int curl_download_internal(struct dload_payload *payload, case CURLE_OK: /* get http/ftp response code */ curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &respcode); + _alpm_log(handle, ALPM_LOG_DEBUG, "response code: %ld\n", respcode); if(respcode >= 400) { payload->unlink_on_fail = 1; + /* non-translated message is same as libcurl */ + snprintf(error_buffer, sizeof(error_buffer), + "The requested URL returned error: %ld", respcode); + _alpm_log(handle, ALPM_LOG_ERROR, + _("failed retrieving file '%s' from %s : %s\n"), + payload->remote_name, hostname, error_buffer); goto cleanup; } break; @@ -402,15 +409,16 @@ static int curl_download_internal(struct dload_payload *payload, if(dload_interrupted == ABORT_OVER_MAXFILESIZE) { payload->curlerr = CURLE_FILESIZE_EXCEEDED; handle->pm_errno = ALPM_ERR_LIBCURL; - /* the hardcoded 'size exceeded' message is same as libcurl's normal */ + /* use the 'size exceeded' message from libcurl */ _alpm_log(handle, ALPM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"), - payload->remote_name, hostname, "Maximum file size exceeded"); + payload->remote_name, hostname, + curl_easy_strerror(CURLE_FILESIZE_EXCEEDED)); } goto cleanup; default: /* delete zero length downloads */ - if(stat(payload->tempfile_name, &st) == 0 && st.st_size == 0) { + if(fstat(fileno(localf), &st) == 0 && st.st_size == 0) { payload->unlink_on_fail = 1; } if(!payload->errors_ok) { -- 1.7.7

1 0

[pacman-dev] [PATCH] Fix libtool detection of --as-needed flag
by Allan McRae 23 Oct '11

23 Oct '11

The fix for -Wl,--as-needed in commit b0f9477f assumes that --as-needed/--no-as-needed is the only option given in a -Wl line. However, it is perfectly valid to specify multiple flags comma separated after a single -Wl (e.g. the default LDFLAGS in Arch Linux makepkg.conf). Adjust the fix so it detect --as-needed in a more general context > readelf -d lib/libalpm/.libs/libalpm.so.?.?.? | grep NEEDED | wc -l Before: 13 After: 5 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This is probably still not the ideal fix... but it works. ltmain.sh | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ltmain.sh b/ltmain.sh index fafd01b..5f505e2 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -5800,9 +5800,12 @@ func_mode_link () arg=$func_stripname_result ;; - -Wl,--as-needed|-Wl,--no-as-needed) - deplibs="$deplibs $arg" - continue + -Wl,*--as-needed*) + deplibs="$deplibs $wl--as-needed" + ;; + + -Wl,*--no-as-needed*) + deplibs="$deplibs $wl--no-as-needed" ;; -Wl,*) -- 1.7.7

2 1

[pacman-dev] [PATCH 1/2] Update libtool files
by Allan McRae 22 Oct '11

22 Oct '11

Update for libtool-2.4.2 while keeping the fix for --as-needed from commit b0f9477f. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- ltmain.sh | 76 +++++++++++++++++++++++++++++++++--------------------- m4/ltversion.m4 | 10 +++--- 2 files changed, 51 insertions(+), 35 deletions(-) mode change 100755 => 100644 ltmain.sh diff --git a/ltmain.sh b/ltmain.sh old mode 100755 new mode 100644 index 4e98c79..fafd01b --- a/ltmain.sh +++ b/ltmain.sh @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ progpath="$0" : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_finish=false opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ esac opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -5060,9 +5063,15 @@ void lt_dump_script (FILE* f) { EOF func_emit_wrapper yes | - $SED -e 's/$[\\"]$/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^$.\{79\}$$..*$/\1\ +\2/ +h +s/$[\\"]$/\\\1/g +s/$/\\n/ +s/$[^\n]*$.*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5646,7 +5655,8 @@ func_mode_link () continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6164,7 +6174,8 @@ func_mode_link () fi continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6848,7 +6859,7 @@ func_mode_link () test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7333,6 +7344,7 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7449,7 +7461,7 @@ func_mode_link () versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8037,6 +8049,11 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8067,7 +8084,7 @@ EOF elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8075,11 +8092,7 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9169,6 +9182,8 @@ EOF esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9278,7 +9293,8 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index 9c7b5d4..07a8602 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) -- 1.7.7

1 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-48-g90ddcbe
by dan＠archlinux.org 22 Oct '11

22 Oct '11

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 90ddcbe71d483884b7627237121b1dee05b07dd0 (commit) via 33bb7dbd356bd1164a1bd6418c0615808fae13f7 (commit) via 32327dc8c9679232ae55935615088c0696f49e86 (commit) via 89edea326bd3d2f4d6feab441d2da961c715dbc0 (commit) via d72487cc009f823e7a5600e018103679a947242c (commit) via 0b155677cf127a2cd765f05125df727bb659b597 (commit) via d6e3446e70bcda9c0f28d80110d588106daa4b5c (commit) via 6f2faf16bac6976423124b77b0b134ebcfae6822 (commit) via 20a47aba8ec859e920bf965ab7da74c26a44339d (commit) via 9e9ecf218344cea86d6b8c6cf7cd246bcfcca98b (commit) via 45f86ca1ca712857e6f84288cf818ce5707fc345 (commit) via e47eb9a7776f529a2c30936c468a5ee0601cfa47 (commit) via 4bada454643e6d91f0b53415bc8d135bc7f578b5 (commit) via bac670ddc9a9dcad2f0665f9f77d04b6736c6db4 (commit) via b633985e609dcd0cd898a3d4d7a59241ccf52084 (commit) via 758d3403cd1221ec89ac3a56183974da6a96dc10 (commit) via 6e29f02e94022e141eced2e0cdcb5b85894317ad (commit) via 842c4422eda231892d4bce75d8e315eb652533b6 (commit) via ae25167bcd592186749b79ea31b10fb78ed9fb2d (commit) via bf84dc4cf1b925cc3ac1fb3185efc50a21802ba4 (commit) from a33424f87955c43652a61fcef5817df07e17bee3 (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 90ddcbe71d483884b7627237121b1dee05b07dd0 Merge: 33bb7db d6e3446 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 21 19:29:47 2011 -0500 Merge branch 'maint' Conflicts: src/pacman/package.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 33bb7dbd356bd1164a1bd6418c0615808fae13f7 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 21 11:41:15 2011 -0500 Hide empty columns in table package list display On -R operations, the "New Version" column is always empty, taking up space and not really showing the user anything valuable. The same is true on -S or -U operations for the "Old Version" column when packages are only being installed and not upgraded. Remove this column so we get a few screen columns back, especially now that we show repo/packagename style output. This also makes some adjustment to the padding logic. We no longer include padding in column widths but it is included in the total table width. We also ensure the last displayed column is always right aligned, even if this is not the actual rightmost column. Example output, before: $ sudo pacman -R eclipse checking dependencies... Targets (1): Name Old Version New Version Net Change eclipse 3.7-1 -194.02 MiB Total Removed Size: 194.02 MiB And after: $ sudo pacman -R eclipse checking dependencies... Targets (1): Name Old Version Net Change eclipse 3.7-1 -194.02 MiB Total Removed Size: 194.02 MiB Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 32327dc8c9679232ae55935615088c0696f49e86 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 16 16:42:25 2011 -0400 pacman: show repo name in download prompt This only applies to the VerbosePkgLists option. Lessens the deficiencies created by earlier work to separate download records by repository. Satisfies FS#26334. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89edea326bd3d2f4d6feab441d2da961c715dbc0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Oct 15 22:17:32 2011 -0400 sync: move file download loop out of download_files Create a new static function called 'download_single_file' which iterates over the servers for each payload. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d72487cc009f823e7a5600e018103679a947242c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Oct 14 22:43:14 2011 -0400 sync: check for necessary disk space for download Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 0b155677cf127a2cd765f05125df727bb659b597 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 21 11:19:45 2011 -0500 sync: extract build_payload() method from find_dl_candidates This is done by both the delta and regular file code, so we can extract a little helper method. Done mostly to satisfy my "why are we repeating code here" itch. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f2faf16bac6976423124b77b0b134ebcfae6822 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Oct 14 19:59:04 2011 -0400 sync: dont group sync records by repository Break out the logic of finding payloads into a separate static function to avoid nesting mayhem. After gathering all the records, download them all at once. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e47eb9a7776f529a2c30936c468a5ee0601cfa47 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 17 12:03:02 2011 -0500 base64: don't compile base64_encode() function We don't use this anywhere; "comment" it out so we still remain relatively close to the upstream sources. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b633985e609dcd0cd898a3d4d7a59241ccf52084 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Oct 14 19:49:53 2011 -0400 dload: add pointer to server list for each payload Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 758d3403cd1221ec89ac3a56183974da6a96dc10 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Oct 16 16:00:35 2011 -0400 diskspace: create static function mount_point_list_free This logic is reused in both diskspace and downloadspace check functions, so pull it out into its own static method. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6e29f02e94022e141eced2e0cdcb5b85894317ad Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Sep 7 22:48:00 2011 -0400 diskspace: add _alpm_check_downloadspace() This function determines if the given cachedir has at least the given amount of free space on it. This will be later used in the sync code to preemptively halt downloads. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ae25167bcd592186749b79ea31b10fb78ed9fb2d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 14 14:50:58 2011 -0500 Large performance improvement for check for owned directories We can take a large shortcut here that saves us a lot of time, especially when upgrading packages with lots of directories. Obviously iterating the full file list of every single package to determine if this directory was present in any other package can take quite some time on a system with many packages installed. We don't need to remove a directory at all if we are upgrading a package and the version we are moving to still had the directory. Also make a small optimization on the package comparsion- we really only care about equality here, not the result of the compare, so we can shortcut using our name_hash. What kind of benefit does this give us? Oh, only a reduction from 295.7 million to 1.4 million strcmp() calls (99.5% fewer) during a `pacman -S linux libreoffice-common` operation. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bf84dc4cf1b925cc3ac1fb3185efc50a21802ba4 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 14 14:50:27 2011 -0500 Make _alpm_filelist_contains() NULL-safe Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.in | 2 +- lib/libalpm/base64.c | 2 + lib/libalpm/base64.h | 2 + lib/libalpm/conflict.c | 10 ++- lib/libalpm/diskspace.c | 62 ++++++++++++++- lib/libalpm/diskspace.h | 2 + lib/libalpm/dload.h | 1 + lib/libalpm/remove.c | 16 +++- lib/libalpm/signing.c | 4 +- lib/libalpm/sync.c | 187 ++++++++++++++++++++++++++++------------------ scripts/pacman-key.sh.in | 1 + src/pacman/callback.c | 2 +- src/pacman/conf.c | 2 +- src/pacman/package.c | 4 +- src/pacman/query.c | 28 ++++---- src/pacman/remove.c | 10 +- src/pacman/sync.c | 32 ++++---- src/pacman/upgrade.c | 6 +- src/pacman/util.c | 133 +++++++++++++++++++++----------- src/pacman/util.h | 2 +- 20 files changed, 331 insertions(+), 177 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-19-gd6e3446
by dan＠archlinux.org 22 Oct '11

22 Oct '11

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 d6e3446e70bcda9c0f28d80110d588106daa4b5c (commit) via 20a47aba8ec859e920bf965ab7da74c26a44339d (commit) via 9e9ecf218344cea86d6b8c6cf7cd246bcfcca98b (commit) via 45f86ca1ca712857e6f84288cf818ce5707fc345 (commit) via 4bada454643e6d91f0b53415bc8d135bc7f578b5 (commit) via bac670ddc9a9dcad2f0665f9f77d04b6736c6db4 (commit) via 842c4422eda231892d4bce75d8e315eb652533b6 (commit) from 020bdb4298cd1bc53df7ca4d911cda7aaa65329c (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 d6e3446e70bcda9c0f28d80110d588106daa4b5c Author: lolilolicon <lolilolicon(a)gmail.com> Date: Thu Oct 20 11:35:00 2011 +0800 bacman: pkgrel does not have to be an integer pkgrel, as with pkgver, simply mustn't contain hyphens. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20a47aba8ec859e920bf965ab7da74c26a44339d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 21 10:51:49 2011 -0500 Remove remaining usages of fprintf() from frontend These can either be replaced with pm_printf() if they are error related, or in the fprintf(stdout, ...) case a bare printf() will do. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9e9ecf218344cea86d6b8c6cf7cd246bcfcca98b Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 21 10:44:19 2011 -0500 Remove pm_fprintf() in favor of pm_printf() Now that pm_printf() always prints to stderr, we don't need this second function that was always used with stderr as the first argument. Thus, this patch removes the function and makes the following sed replacement: sed -i -e 's#pm_fprintf(stderr, #pm_printf(#g' src/pacman/*.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 45f86ca1ca712857e6f84288cf818ce5707fc345 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 21 10:38:02 2011 -0500 Use stderr as output stream for pm_printf() This matches what we now do in our backend callback function- all debug/info/warning/error/etc. messages should be on stderr. These are all the messages with a "warning:" or other type prefix, so does not affect general pacman output. This should fix the output confusion noted in FS#26555. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4bada454643e6d91f0b53415bc8d135bc7f578b5 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 17 09:42:46 2011 -0500 pacman-key: add a default keyserver timeout value on --init The default is supposidely 30 seconds from the gpg manpage, but that sure wasn't what I was seeing- it was somewhere closer to two minutes of silence. Add a more reasonable 10 second timeout value which should be good enough for any keyserver that doesn't totally stink at it's job. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bac670ddc9a9dcad2f0665f9f77d04b6736c6db4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 17 09:38:35 2011 -0500 Show an error message on failed remote key lookup The absolutely terrible part about this is the failure on GPGME's part to distinguish between "key not found" and "keyserver timeout". Instead, it returns the same silly GPG_ERR_EOF in both cases (why isn't GPG_ERR_TIMEOUT being used?), leaving us helpless to tell them apart. Spit out a generic enough error message that covers both cases; unfortunately we can't provide much guidance to the user because we aren't sure what actually happened. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 842c4422eda231892d4bce75d8e315eb652533b6 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 17 08:28:57 2011 -0500 Table display: print message with warning: prefix Use the normal error functions here rather than a bare fprintf(). Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bacman.in | 2 +- lib/libalpm/signing.c | 4 ++-- scripts/pacman-key.sh.in | 1 + src/pacman/conf.c | 2 +- src/pacman/package.c | 8 ++++---- src/pacman/query.c | 28 ++++++++++++++-------------- src/pacman/remove.c | 10 +++++----- src/pacman/sync.c | 32 ++++++++++++++++---------------- src/pacman/upgrade.c | 6 +++--- src/pacman/util.c | 31 ++++++++++--------------------- src/pacman/util.h | 2 +- 11 files changed, 58 insertions(+), 68 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Hide empty columns in table package list display
by Dan McGee 21 Oct '11

21 Oct '11

On -R operations, the "New Version" column is always empty, taking up space and not really showing the user anything valuable. The same is true on -S or -U operations for the "Old Version" column when packages are only being installed and not upgraded. Remove this column so we get a few screen columns back, especially now that we show repo/packagename style output. This also makes some adjustment to the padding logic. We no longer include padding in column widths but it is included in the total table width. We also ensure the last displayed column is always right aligned, even if this is not the actual rightmost column. Example output, before: $ sudo pacman -R eclipse checking dependencies... Targets (1): Name Old Version New Version Net Change eclipse 3.7-1 -194.02 MiB Total Removed Size: 194.02 MiB And after: $ sudo pacman -R eclipse checking dependencies... Targets (1): Name Old Version Net Change eclipse 3.7-1 -194.02 MiB Total Removed Size: 194.02 MiB Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/util.c | 50 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 39 insertions(+), 11 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 77215de..06f8c3b 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -488,17 +488,23 @@ void string_display(const char *title, const char *string) } static void table_print_line(const alpm_list_t *line, - size_t colcount, size_t *widths) + size_t colcount, size_t *widths, int *has_data) { size_t i; const alpm_list_t *curcell; for(i = 0, curcell = line; curcell && i < colcount; i++, curcell = alpm_list_next(curcell)) { - const char *value = curcell->data; - size_t len = string_length(value); + const char *value; + int padding; + + if(!has_data[i]) { + continue; + } + + value = curcell->data; /* silly printf requires padding size to be an int */ - int padding = (int)widths[i] - (int)len; + padding = (int)widths[i] - (int)string_length(value); if(padding < 0) { padding = 0; } @@ -513,26 +519,42 @@ static void table_print_line(const alpm_list_t *line, printf("\n"); } -/* find the max string width of each column */ + + +/** + * Find the max string width of each column. Also determines whether values + * exist in the column and sets the value in has_data accordingly. + * @param header a list of header strings + * @param rows a list of lists of rows as strings + * @param totalcols the total number of columns in the header and each row + * @param widths a pointer to store width data + * @param has_data a pointer to store whether column has data + * + * @return the total width of the table; 0 on failure + */ static size_t table_calc_widths(const alpm_list_t *header, - const alpm_list_t *rows, size_t totalcols, size_t **widths) + const alpm_list_t *rows, size_t totalcols, size_t **widths, + int **has_data) { const alpm_list_t *i; const unsigned short padding = 2; size_t curcol, totalwidth = 0; size_t *colwidths; + int *coldata; if(totalcols <= 0) { return 0; } colwidths = malloc(totalcols * sizeof(size_t)); - if(!colwidths) { + coldata = calloc(totalcols, sizeof(int)); + if(!colwidths || !coldata) { return 0; } /* header determines column count and initial values of longest_strs */ for(i = header, curcol = 0; i; i = alpm_list_next(i), curcol++) { colwidths[curcol] = string_length(i->data); + /* note: header does not determine whether column has data */ } /* now find the longest string in each column */ @@ -546,6 +568,9 @@ static size_t table_calc_widths(const alpm_list_t *header, if(str_len > colwidths[curcol]) { colwidths[curcol] = str_len; } + if(str_len > 0) { + coldata[curcol] = 1; + } } } @@ -558,6 +583,7 @@ static size_t table_calc_widths(const alpm_list_t *header, } *widths = colwidths; + *has_data = coldata; return totalwidth; } @@ -576,20 +602,21 @@ int table_display(const char *title, const alpm_list_t *header, { const alpm_list_t *i; size_t *widths = NULL, totalcols, totalwidth; + int *has_data = NULL; if(rows == NULL || header == NULL) { return 0; } totalcols = alpm_list_count(header); - totalwidth = table_calc_widths(header, rows, totalcols, &widths); + totalwidth = table_calc_widths(header, rows, totalcols, &widths, &has_data); /* return -1 if terminal is not wide enough */ if(totalwidth > getcols()) { pm_printf(ALPM_LOG_WARNING, _("insufficient columns available for table display\n")); return -1; } - if(!totalwidth || !widths) { + if(!totalwidth || !widths || !has_data) { return -1; } @@ -597,14 +624,15 @@ int table_display(const char *title, const alpm_list_t *header, printf("%s\n\n", title); } - table_print_line(header, totalcols, widths); + table_print_line(header, totalcols, widths, has_data); printf("\n"); for(i = rows; i; i = alpm_list_next(i)) { - table_print_line(i->data, totalcols, widths); + table_print_line(i->data, totalcols, widths, has_data); } free(widths); + free(has_data); return 0; } -- 1.7.7

1 1

[pacman-dev] [PATCH] sync: extract build_payload() method from find_dl_candidates
by Dan McGee 21 Oct '11

21 Oct '11

This is done by both the delta and regular file code, so we can extract a little helper method. Done mostly to satisfy my "why are we repeating code here" itch. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/sync.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index a5e8a5e..04c557b 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -790,6 +790,18 @@ static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas) return 0; } +static struct dload_payload *build_payload(alpm_handle_t *handle, + const char *filename, size_t size, alpm_list_t *servers) +{ + struct dload_payload *payload; + + CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); + STRDUP(payload->remote_name, filename, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); + payload->max_size = size; + payload->servers = servers; + return payload; +} + static int find_dl_candidates(alpm_db_t *repo, alpm_list_t **files, alpm_list_t **deltas) { alpm_list_t *i; @@ -814,14 +826,10 @@ static int find_dl_candidates(alpm_db_t *repo, alpm_list_t **files, alpm_list_t for(dlts = delta_path; dlts; dlts = dlts->next) { alpm_delta_t *delta = dlts->data; if(delta->download_size != 0) { - struct dload_payload *dpayload; - - CALLOC(dpayload, 1, sizeof(*dpayload), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - STRDUP(dpayload->remote_name, delta->delta, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - dpayload->max_size = delta->download_size; - dpayload->servers = repo->servers; - - *files = alpm_list_add(*files, dpayload); + struct dload_payload *payload = build_payload( + handle, delta->delta, delta->download_size, repo->servers); + ASSERT(payload, return -1); + *files = alpm_list_add(*files, payload); } /* keep a list of all the delta files for md5sums */ *deltas = alpm_list_add(*deltas, delta); @@ -829,13 +837,9 @@ static int find_dl_candidates(alpm_db_t *repo, alpm_list_t **files, alpm_list_t } else if(spkg->download_size != 0) { struct dload_payload *payload; - ASSERT(spkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); - CALLOC(payload, 1, sizeof(*payload), RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - STRDUP(payload->remote_name, spkg->filename, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - payload->max_size = spkg->size; - payload->servers = repo->servers; - + payload = build_payload(handle, spkg->filename, spkg->size, repo->servers); + ASSERT(payload, return -1); *files = alpm_list_add(*files, payload); } } -- 1.7.7

1 0

[pacman-dev] [PATCH 1/3] Use stderr as output stream for pm_printf()
by Dan McGee 21 Oct '11

21 Oct '11

This matches what we now do in our backend callback function- all debug/info/warning/error/etc. messages should be on stderr. These are all the messages with a "warning:" or other type prefix, so does not affect general pacman output. This should fix the output confusion noted in FS#26555. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This and the following two patches are for maint. src/pacman/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 60e2914..1ca9b4d 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1417,7 +1417,7 @@ int pm_printf(alpm_loglevel_t level, const char *format, ...) /* print the message using va_arg list */ va_start(args, format); - ret = pm_vfprintf(stdout, level, format, args); + ret = pm_vfprintf(stderr, level, format, args); va_end(args); return ret; -- 1.7.7

1 2

[pacman-dev] Feature request: Show exact matches first
by Markus Jochim 20 Oct '11

20 Oct '11

Dear developers, I'd like to request a feature. When I search for some package, let's say openconnect: $ pacman -Ss openconnect (or -Qs) it takes quite a while until I get any results on my netbook (Atom N450 cpu). Maybe this could be sped up by showing exact matches right away. I've had this situation quite some times now and it can be a real pain in the ass to wait for 10 seconds (this may vary of course) when I simply want to know whether I have a particular package installed. Kindly, Markus

6 7

[pacman-dev] [PATCH] bacman: pkgrel does not have to be an integer
by lolilolicon 20 Oct '11

20 Oct '11

pkgrel, as with pkgver, simply mustn't contain hyphens. Signed-off-by: lolilolicon <lolilolicon(a)gmail.com> --- contrib/bacman.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/bacman.in b/contrib/bacman.in index 9636091..c55d716 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -93,7 +93,7 @@ pkg_dest="${PKGDEST:-$PWD}" pkg_pkger=${PACKAGER:-'Unknown Packager'} pkg_name="$1" -pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([0-9])) +pkg_dir=("$pac_db/$pkg_name"-+([^-])-+([^-])) pkg_namver=("${pkg_dir[@]##*/}") # -- 1.7.6.4

1 0