November 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] Porting pacman to Windows
by Alexpux 12 Nov '13

12 Nov '13

Hi all! First, thanks for the great package manager - very flexible and fast. I’m successfully using pacman with some modifications under MSYS2 (Cygwin) to build and organize package development. Also I create my own online repository for MSYS2. I want to thank the developers for their work! Regards, Alexey.

1 0

[pacman-dev] [PATCH] Improve --help switch output for pacman contrib and pacman scripts
by Jason St. John 12 Nov '13

12 Nov '13

Unify the formatting of the --help switch for pacman utils, if it exists. All of the pacman utils will now output help text using the following format: util-name (pacman) v<pacman version> one line description of util's purpose Usage: util-name [options] -b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message Reported-by: Karol Błażewicz <karol.blazewicz at gmail.com> Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This patch is analogous to commit a86015f except this one deals with pacman contrib and pacman scripts instead of pacman utils. Note: This is a resubmit based on Andrew's feedback on the ML here: https://mailman.archlinux.org/pipermail/pacman-dev/2013-October/018142.html contrib/bacman.sh.in | 10 +++++++--- contrib/checkupdates.sh.in | 13 ++++++++++--- contrib/paccache.sh.in | 20 ++++++++++---------- contrib/pacdiff.sh.in | 8 +++++--- contrib/paclist.sh.in | 10 +++++++--- contrib/paclog-pkglist.sh.in | 12 +++++++++--- contrib/pacscripts.sh.in | 16 +++++++++------- contrib/pacsearch.in | 5 +++-- contrib/pacsysclean.sh.in | 8 +++++--- contrib/rankmirrors.sh.in | 13 +++++++++---- contrib/updpkgsums.sh.in | 18 +++++++++++------- scripts/makepkg.sh.in | 2 ++ scripts/pacman-db-upgrade.sh.in | 7 +++++-- scripts/pkgdelta.sh.in | 11 +++++++---- 14 files changed, 99 insertions(+), 54 deletions(-) diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 74a83bc..a20c5e7 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -37,9 +37,13 @@ m4_include(../scripts/library/output_format.sh) # User Friendliness # usage() { - echo "This program recreates a package using pacman's db and system files" - echo "Usage: $myname [--nocolor] [--pacnew] <installed package name>" - echo "Example: $myname kernel26" + echo "${myname} (pacman) v${myver}" + echo + echo "Recreate a package using pacman's database and system files" + echo + echo "Usage: ${myname} [--nocolor] [--pacnew] <installed package name>" + echo + echo "Example: ${myname} linux-headers" } version() { diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 48ceff9..413b78a 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -18,10 +18,17 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +declare -r myname='checkupdates' +declare -r myver='@PACKAGE_VERSION@' + if (( $# > 0 )); then - echo "checkupdates: Safely print a list of pending updates." - echo "Use: checkupdates" - echo "Export the 'CHECKUPDATES_DB' variable to change the path of the temporary database." + echo "${myname} (pacman) v${myver}" + echo + echo "Safely print a list of pending updates" + echo + echo "Usage: ${myname}" + echo + echo 'Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.' exit 0 fi diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 6b8df25..10eab21 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -152,27 +152,27 @@ summarize() { usage() { cat <<EOF -usage: $myname <operation> [options] [targets...] +${myname} (pacman) v${myver} -$myname is a flexible pacman cache cleaning utility, which has numerous -options to help control how much, and what, is deleted from any directory -containing pacman package tarballs. +A flexible pacman cache cleaning utility. + +Usage: ${myname} <operation> [options] [targets...] Operations: -d, --dryrun perform a dry run, only finding candidate packages. - -m, --move <dir> move candidate packages to 'movedir'. + -m, --move <dir> move candidate packages to "movedir". -r, --remove remove candidate packages. Options: - -a, --arch <arch> scan for 'arch' (default: all architectures). - -c, --cachedir <dir> scan 'cachedir' for packages. + -a, --arch <arch> scan for "arch" (default: all architectures). + -c, --cachedir <dir> scan "cachedir" for packages. (default: @localstatedir@/cache/pacman/pkg). -f, --force apply force to mv(1) and rm(1) operations. -h, --help display this help message and exit. - -i, --ignore <pkgs> ignore 'pkgs', comma separated. Alternatively, specify - '-' to read package names from stdin, newline + -i, --ignore <pkgs> ignore "pkgs", comma-separated. Alternatively, specify + "-" to read package names from stdin, newline- delimited. - -k, --keep <num> keep 'num' of each package in 'cachedir' (default: 3). + -k, --keep <num> keep "num" of each package in "cachedir" (default: 3). --nocolor remove color from output. -u, --uninstalled target uninstalled packages. -v, --verbose increase verbosity. specify up to 3 times. diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 6e70fee..1bad0e4 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -33,20 +33,22 @@ m4_include(../scripts/library/output_format.sh) usage() { cat <<EOF -$myname is a simple pacnew/pacorig/pacsave updater. +${myname} (pacman) v${myver} + +A simple program to merge or remove pacnew/pacorig/pacsave files. Usage: $myname [-l | -f | -p] [--nocolor] Search Options: select one, default: pacmandb -l/--locate scan using locate -f/--find scan using find - -p/--pacmandb scan active config files from pacman db + -p/--pacmandb scan active config files from pacman database General Options: -o/--output print files instead of merging them --nocolor remove colors from output -Enviroment Variables: +Environment Variables: DIFFPROG override the merge program: (default: vimdiff) DIFFSEARCHPATH override the search path. (only when using find) (default: /etc) diff --git a/contrib/paclist.sh.in b/contrib/paclist.sh.in index 7883e21..319dcba 100644 --- a/contrib/paclist.sh.in +++ b/contrib/paclist.sh.in @@ -31,9 +31,13 @@ if ! type gettext &>/dev/null; then fi usage() { - printf '%s - List all packages installed from a given repo\n' "$myname" - printf 'Usage: %s <repo>\n' "$myname" - printf 'Example: %s testing\n' "$myname" + printf "%s (pacman) v%s\n" "${myname}" "myver" + echo + printf "List all packages installed from a given repository\n" "${myname}" + echo + printf "Usage: %s <repository>\n" "${myname}" + echo + printf "Example: %s testing\n" "${myname}" } version() { diff --git a/contrib/paclog-pkglist.sh.in b/contrib/paclog-pkglist.sh.in index 9b3abad..aaa7586 100644 --- a/contrib/paclog-pkglist.sh.in +++ b/contrib/paclog-pkglist.sh.in @@ -25,9 +25,15 @@ export TEXTDOMAINDIR='/usr/share/locale' declare logfile=${1:-@localstatedir@/log/pacman.log} usage() { - printf 'usage: %s [pacman log]\n' "$myname" - printf 'example: %s @localstatedir@/log/pacman.log\n' "$myname" - printf '\ndefaults to: @localstatedir@/log/pacman.log\n' + printf "%s (pacman) v%s\n" "${myname}" "${myver}" + echo + echo "Parse a log file into a list of currently installed packages" + echo + printf "Usage: %s [path to pacman log]\n" "${myname}" + echo + printf "Example: %s @localstatedir@/log/pacman.log\n" "${myname}" + echo + printf 'Defaults to: @localstatedir@/log/pacman.log' } version() { diff --git a/contrib/pacscripts.sh.in b/contrib/pacscripts.sh.in index 62c4e35..8453f9c 100644 --- a/contrib/pacscripts.sh.in +++ b/contrib/pacscripts.sh.in @@ -46,16 +46,18 @@ error() { } usage() { - echo "This program prints out the {pre,post}_{install,remove,upgrade} scripts" - echo "of a given package." - echo "Usage: $myname pkgname|pkgfile" + echo "${myname} (pacman) v${myver}" echo - echo " OPTIONS:" + echo "Prints the {pre,post}_{install,remove,upgrade} scripts of a given package." + echo + echo "Usage: ${myname} <pkgname|pkgfile>" + echo + echo " Options:" echo " -h, --help Print this help message" echo " -v, --version Print program name and version" echo - echo "Example: $myname gconf-editor" - echo "Example: $myname gconf-editor-2.24.1-1-x86_64.pkg.tar.gz" + echo "Example: ${myname} gconf-editor" + echo "Example: ${myname} gconf-editor-3.0.1-3-x86_64.pkg.tar.xz" } version() { @@ -70,7 +72,7 @@ spacman() { else if ! type -p sudo; then error "Cannot find the sudo binary! Is sudo installed?" - error "Otherwise try to run the program as root" + error "Otherwise, try to run the program as root" exit 1 else sudo pacman "$@" diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index b1db8ab..624f201 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -28,8 +28,9 @@ my $myname = 'pacsearch'; my $myver = '@PACKAGE_VERSION@'; sub usage { - print "$myname - Add color and install information to a pacman -Ss search\n"; - print "Usage: $myname <pattern>\n"; + print "$myname (pacman) v$myver\n\n"; + print "Add color and install information to a 'pacman -Ss' search\n\n"; + print "Usage: $myname <pattern>\n\n"; print "Example: $myname ^gnome\n"; } diff --git a/contrib/pacsysclean.sh.in b/contrib/pacsysclean.sh.in index 37219ab..3631921 100644 --- a/contrib/pacsysclean.sh.in +++ b/contrib/pacsysclean.sh.in @@ -8,9 +8,12 @@ declare -r myver='@PACKAGE_VERSION@' PACMAN_OPTS= usage() { - echo "$myname - Sort installed packages by increasing installed size." + echo "${myname} (pacman) v${myver}" echo - echo "Usage: $myname [options]" + echo "Sort installed packages by increasing installed size. Useful for" + echo "system clean-up." + echo + echo "Usage: ${myname} [options]" echo echo "Options:" echo " -o <options> Specify custom pacman query options (e.g., dt)" @@ -22,7 +25,6 @@ version() { echo 'Copyright (C) 2011 Eric Bélanger <snowmaniscool(a)gmail.com>' } - if [ -n "$1" ]; then case "$1" in -o) PACMAN_OPTS="${2}" ;; diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index 82bf9ae..0c4c734 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -21,26 +21,31 @@ # traps interrupt key to spit out pre-interrupt info trap finaloutput INT +declare -r myname='rankmirrors' +declare -r myver='@PACKAGE_VERSION@' + usage() { - echo "Usage: rankmirrors [options] MIRRORFILE | URL" + echo "${myname} (pacman) v${myver}" echo echo "Ranks pacman mirrors by their connection and opening speed. Pacman mirror" echo "files are located in @sysconfdir@/pacman.d/. It can also rank one mirror if the URL is" echo "provided." echo + echo "Usage: ${myname} [options] MIRRORFILE | URL" + echo echo "Options:" echo " --version show program's version number and exit" echo " -h, --help show this help message and exit" echo " -n NUM number of servers to output, 0 for all" echo " -t, --times only output mirrors and their response times" - echo " -u, --url test a specific url" + echo " -u, --url test a specific URL" echo " -v, --verbose be verbose in ouptut" - echo " -r, --repo specify a specific repo name instead of guessing" + echo " -r, --repo specify a repository name instead of guessing" exit 0 } version() { - echo "rankmirrors (pacman) @PACKAGE_VERSION@" + echo "${myname} (pacman) ${myver}" echo "Copyright (c) 2009 Matthew Bruenig <matthewbruenig(a)gmail.com>." echo echo "This is free software; see the source for copying conditions." diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 4d35357..0f52db4 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -23,12 +23,16 @@ declare -r myname='updpkgsums' declare -r myver='@PACKAGE_VERSION@' usage() { - printf 'usage: %s [buildfile]\n\n' "$myname" - printf ' -h, --help display this help message and exit\n' - printf ' -V, --version display version information and exit\n\n' - printf '%s will perform an in place update the checksums in the\n' "$myname" - printf 'path specified by [buildfile], defaulting to PKGBUILD in the current\n' - printf 'working directory.\n' + printf "%s (pacman) v%s\n" "${myname}" "${myver}" + echo + printf "%s will perform an in place update of the checksums in the\n" "${myname}" + echo "path specified by [build file], defaulting to PKGBUILD in the current" + echo "working directory." + echo + printf "Usage: %s [build file]\n" "${myname}" + echo + echo " -h, --help display this help message and exit" + echo " -V, --version display version information and exit" } version() { @@ -43,7 +47,7 @@ esac buildfile=${1:-PKGBUILD} if [[ ! -f $buildfile ]]; then - printf '==> ERROR: %s not found or is not a file\n' "$buildfile" + printf "==> ERROR: %s not found or is not a file\n" "$buildfile" exit 1 fi diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 387fadb..de9310f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2483,6 +2483,8 @@ m4_include(library/parseopts.sh) usage() { printf "makepkg (pacman) %s\n" "$makepkg_version" echo + printf -- "$(gettext "Make packages compatible for use with pacman")\n" + echo printf -- "$(gettext "Usage: %s [options]")\n" "$0" echo printf -- "$(gettext "Options:")\n" diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index a1630c5..2b39538 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -33,8 +33,11 @@ USE_COLOR='y' m4_include(library/output_format.sh) usage() { - printf "pacman-db-upgrade (pacman) %s\n\n" "$myver" - printf -- "$(gettext "Usage: %s [--nocolor] [pacman_db_root]")\n\n" "$0" + printf "pacman-db-upgrade (pacman) %s\n" "${myver}" + echo + printf -- "$(gettext "Upgrade the local pacman database to a newer format")\n" + echo + printf -- "$(gettext "Usage: %s [--nocolor] [pacman_db_root]")\n" "$0" } version() { diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 39046b8..cc1f9ac 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -46,11 +46,14 @@ m4_include(library/output_format.sh) # print usage instructions usage() { - printf "pkgdelta (pacman) %s\n\n" "$myver" + printf "pkgdelta (pacman) %s\n" "${myver}" + echo printf -- "$(gettext "Usage: pkgdelta [options] <package1> <package2>\n")" + echo printf -- "$(gettext "\ - pkgdelta will create a delta file between two packages.\n\ -This delta file can then be added to a database using repo-add.\n\n")" +pkgdelta will create a delta file between two packages.\n\ +This delta file can then be added to a database using repo-add.\n")" + echo printf -- "$(gettext "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")\n" echo printf -- "$(gettext "Options:\n")" @@ -61,7 +64,7 @@ This delta file can then be added to a database using repo-add.\n\n")" } version() { - printf "pkgdelta (pacman) %s\n\n" "$myver" + printf "pkgdelta (pacman) %s\n" "$myver" printf -- "$(gettext "\ Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\n\n\ This is free software; see the source for copying conditions.\n\ -- 1.8.4.2

2 3

[pacman-dev] [PATCH] pacsort: refactor version comparison for correctness
by Dave Reisner 11 Nov '13

11 Nov '13

This refactors the existing vercmp machinery in order to: 1) Correct a deficiency in files comparison. This was too lazily written and could produce incorrect results when a version contained an epoch. 2) Improve tarball detection. Calling fnmatch a second time for the uncompressed tarball case is not a noticeable performance hit, and is more correct. 3) Fix a bug in tarball detection. The glob pattern would match files with only a pkgver, e.g. foopkg-1.2.3-x86_64.pkg.tar.xz. 4) Be generally cleaner code, easier to follow. The test suite gets extended to validate my claims for the new behavior. Fixes FS#37631. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This supersedes an earlier patch I sent against pacsort which was a bit more directed and less useful. src/util/pacsort.c | 164 ++++++++++++++++++++++++++++++++++------------- test/util/pacsorttest.sh | 31 ++++++++- 2 files changed, 150 insertions(+), 45 deletions(-) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 687e558..554352c 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -20,6 +20,7 @@ #include <errno.h> #include <fnmatch.h> #include <getopt.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -40,6 +41,14 @@ struct list_t { size_t maxcount; }; +struct pkgmeta_t { + const char *pkgname; + size_t pkgname_len; + + const char *pkgver; + size_t pkgver_len; +}; + static struct options_t { int order; int sortkey; @@ -258,57 +267,124 @@ static const char *nth_column(const char *string) return prev; } -static int vercmp(const void *p1, const void *p2) +static void extract_pkgmeta(const char *path, struct pkgmeta_t *meta) { - const char *name1, *name2; - char *fn1 = NULL, *fn2 = NULL; - int r; - - name1 = *(const char **)p1; - name2 = *(const char **)p2; - - /* if we're operating in file mode, we modify the strings under certain - * conditions to appease alpm_pkg_vercmp(). If and only if both inputs end - * with a suffix that appears to be a package name, we strip the suffix and - * remove any leading paths. This means that strings such as: - * - * /var/cache/pacman/pkg/firefox-18.0-2-x86_64.pkg.tar.xz - * firefox-18.0-2-x86_64.pkg.tar.gz - * - * Will be considered equal by this version comparison - */ - if(opts.filemode) { - if(fnmatch("*-*.pkg.tar.?z", name1, 0) == 0 && - fnmatch("*-*.pkg.tar.?z", name2, 0) == 0) { - const char *start, *end; - - start = strrchr(name1, '/'); - start = start ? start + 1 : name1; - end = strrchr(name1, '-'); - fn1 = strndup(start, end - start); - - start = strrchr(name2, '/'); - start = start ? start + 1 : name2; - end = strrchr(name2, '-'); - fn2 = strndup(start, end - start); - - name1 = fn1; - name2 = fn2; - } - } + const char *pkgver_end; + const char *slash; + + /* Find the basename */ + slash = strrchr(path, '/'); + meta->pkgname = slash ? slash + 1 : path; + pkgver_end = strrchr(meta->pkgname, '-'); + + /* Read backwards through pkgrel */ + for(meta->pkgver = pkgver_end - 1; + meta->pkgver > meta->pkgname && *meta->pkgver != '-'; + --meta->pkgver) + ; + /* Read backwards through pkgver */ + for(--meta->pkgver; + meta->pkgver > meta->pkgname && *meta->pkgver != '-'; + --meta->pkgver) + ; + ++meta->pkgver; + + meta->pkgname_len = meta->pkgver - meta->pkgname - 1; + meta->pkgver_len = pkgver_end - meta->pkgver; +} + +static int is_pkgtar(const char *string) +{ + return fnmatch("*-*-*.pkg.tar.?z", string, 0) == 0 || + fnmatch("*-*-*.pkg.tar", string, 0) == 0; +} + +static int vercmp_versions(const char *ver1, const char *ver2) +{ + return alpm_pkg_vercmp(nth_column(ver1), nth_column(ver2)); +} + +static int pkgmeta_vercmp(struct pkgmeta_t *pkg1, struct pkgmeta_t *pkg2) +{ + char v1[PATH_MAX], v2[PATH_MAX]; + + memcpy(v1, pkg1->pkgname, pkg1->pkgname_len); + v1[pkg1->pkgname_len] = '\0'; + + memcpy(v2, pkg2->pkgname, pkg2->pkgname_len); + v2[pkg2->pkgname_len] = '\0'; - if(opts.sortkey == 0) { - r = opts.order * alpm_pkg_vercmp(name1, name2); + return alpm_pkg_vercmp(v1, v2); +} + +static int pkgmeta_namecmp(struct pkgmeta_t *pkg1, struct pkgmeta_t *pkg2) +{ + int cmp; + const size_t cmplen = (pkg1->pkgname_len < pkg2->pkgname_len) ? + pkg1->pkgname_len : pkg2->pkgname_len; + + cmp = memcmp(pkg1->pkgname, pkg2->pkgname, cmplen); + if(cmp != 0) { + return cmp; } else { - r = opts.order * alpm_pkg_vercmp(nth_column(name1), nth_column(name2)); + return pkg1->pkgname_len - pkg2->pkgname_len; } +} - if(opts.filemode) { - free(fn1); - free(fn2); +static int pkgmeta_trailercmp(struct pkgmeta_t *pkg1, struct pkgmeta_t *pkg2) +{ + return strcmp(&pkg1->pkgver[pkg1->pkgver_len], + &pkg2->pkgver[pkg2->pkgver_len]); +} + +static int pkgmeta_cmp(struct pkgmeta_t *pkg1, struct pkgmeta_t *pkg2) +{ + int cmp; + + /* 1) Compare the package names. */ + cmp = pkgmeta_namecmp(pkg1, pkg2); + if(cmp != 0) { + return cmp; + } + + /* 2) Compare the versions. */ + cmp = pkgmeta_vercmp(pkg1, pkg2); + if(cmp != 0) { + return cmp; + } + + /* 3) Nothing else to do, compare the remainder of the strings lexically. */ + return pkgmeta_trailercmp(pkg1, pkg2); +} + +static int vercmp_files(const char *file1, const char *file2) +{ + struct pkgmeta_t pkg1, pkg2; + + /* In order for 2 files to be considered equal, they must have the same + * basename. For example, the two follow strings are considered equal: + * /var/cache/pacman/pkg/pacman-4.1.1-1-x86_64.pkg.tar.gz + * /share/packages/pacman-4.1.1-1-x86_64.pkg.tar.gz + */ + + extract_pkgmeta(file1, &pkg1); + extract_pkgmeta(file2, &pkg2); + + return pkgmeta_cmp(&pkg1, &pkg2); +} + +static int vercmp(const void *v1, const void *v2) +{ + const char *s1 = *(const char **)v1, *s2 = *(const char **)v2; + int cmp; + + if(opts.filemode && is_pkgtar(s1) && is_pkgtar(s1)) { + cmp = vercmp_files(s1, s2); + } else { + cmp = vercmp_versions(s1, s2); } - return r; + return opts.order * cmp; } static char escape_char(const char *string) diff --git a/test/util/pacsorttest.sh b/test/util/pacsorttest.sh index ac16c45..dbd11d1 100755 --- a/test/util/pacsorttest.sh +++ b/test/util/pacsorttest.sh @@ -21,7 +21,7 @@ # default binary if one was not specified as $1 bin=${1:-${PMTEST_UTIL_DIR}pacsort} # holds counts of tests -total=23 +total=32 run=0 failure=0 @@ -89,6 +89,35 @@ runtest $in $in "filename sort with uneven leading path components" "--files" in="firefox-18.0-2-i686.pkg.tar.xz\nfirefox-18.0.1-1-x86_64.pkg.tar.gz\n" runtest $in $in "filename sort with different extensions" "--files" +in="/path1/path2/firefox-18.0.1-1-x86_64.pkg.tar.xz\n/path2/firefox-18.0-2-x86_64.pkg.tar.xz\n" +runtest $in $in "filename reverse sort" "--files --reverse" + +in="/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n/packages/dialog-1:1.2_20130928-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename sort with epoch" "--files" + +in="/packages/dia-log-1:1.2_20130928-1-x86_64.pkg.tar.xz\n/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename with different pkgname sort with epoch" "--files" + +in="/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n/packages/dialoggg-1:1.2_20130928-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename with shared prefix sort with epoch" "--files" + +in="/packages/dialoggg-1:1.2_20130928-1-x86_64.pkg.tar.xz\n/packages/dialog-1.2_20131001-1-x86_64.pkg.tar.xz\n" +runtest $in $in "filename reverse sort with epoch" "--files --reverse" + +in="firefox-18.0-2-i686.pkg.tar.gz\nfirefox-18.0-2-x86_64.pkg.tar.gz\n" +runtest "$in" "$in" "filename sort with different architecture" "--files" + +in="firefox-18.0-2-x86_64.pkg.tar.gz\nfirefox-18.0-2-x86_64.pkg.tar.xz\n" +runtest "$in" "$in" "filename sort with different compression" "--files" + +in="10 3\n10 2\n10 1\n" +ex="10 1\n10 2\n10 3\n" +runtest "$in" "$ex" "sort on key" "--key 2" + +in="10 3 1000\n10 2 2000\n10 1\n" +ex="10 1\n10 3 1000\n10 2 2000\n" +runtest "$in" "$ex" "sort on key with uneven columns" "--key 3" + # generate some long input/expected for the next few tests declare normal reverse names_normal names_reverse for ((i=1; i<600; i++)); do -- 1.8.4.2

2 1

[pacman-dev] [PATCH 0/8] Wondering if Python 3 could run the tests?
by Jeremy Heiner 10 Nov '13

10 Nov '13

The short answer is: yes, it can. The slightly longer answer is: with these patches the test framework is compatible with any Python from 2.5 up to 3.3. Relax: none of these patches actually change which version gets used during a build. This is just an exploration of what is needed to get over the bump from Python 2 to 3. This experiment came about as I was working on the -Qk(k) unit tests. I realized that I had used a 2.7 specific feature, and I stopped to grep through the code and the mailing list to see if that was a no-no. That lead me to trying out 2.6 and then 2.5 to see what version the framework needed. Patch 1 is about that lower end of the scale. This naturally got me wondering about the upper end and how much pain it would be to move in that direction. Python offers tools to help migration. Patch 2 came from running "python2 -3". And patches 3 thru 7 came from "2to3" (split into commits by the specific issue). After those the code was syntactically acceptable to 3.3, and so the last two issues, fixed in Patch 8, came from runtime exceptions. Most of the difficult work was setting up a test environment for the pactest framework so I could be assured that the changes suggested by the migration tools wouldn't break anything. And splitting up what "2to3" reported into commits that would make sense. I am ambivalent on the prosepect of accepting these patches into the code base. Python 2.7 isn't going to disappear tomorrow, so there's no fire. There are no features in 3.x that are must-have solutions to a pain point. Nothing's really broken, so these patches aren't really fixing anything. All very true. The only advantage I can think of is that it might entice more people into writing more tests if they could use they shiny (overly hyped?) new 3.x features instead of that old boring 2.7 stuff. At the very least I would suggest that it would be very helpful to explicitly state somewhere in the test framework code the minimum version needed. I've determined it could be set to 2.5 (no, I did not check lower than that), but it would make much more sense to pick 2.7. Assuming, that is, that the consensus will be that jumping to 3.x is a bridge too far. Jeremy Heiner (8): Restore ability to run tests with version 2.5 of Python. Use Python's "exec" instead of deprecated "execfile". Python 3 octal literals broke backwards compatibility. Add shims to return views on Python dicts. Add shims to return a new Python StringIO instance. Use Python's "range" instead of deprecated "xrange". Add parens around tuples in Python for comprehensions. Allow tests to be run with either version 2 or 3 of Python. test/pacman/pmdb.py | 7 +++--- test/pacman/pmpkg.py | 11 +++++---- test/pacman/pmtest.py | 14 +++++++---- test/pacman/tests/depconflict100.py | 2 +- test/pacman/tests/depconflict120.py | 2 +- test/pacman/tests/epoch005.py | 2 +- test/pacman/tests/fileconflict001.py | 2 +- test/pacman/tests/fileconflict002.py | 2 +- test/pacman/tests/query006.py | 3 +-- test/pacman/tests/remove052.py | 2 +- test/pacman/tests/smoke001.py | 4 +-- test/pacman/tests/smoke003.py | 4 +-- test/pacman/tests/sync030.py | 2 +- test/pacman/tests/sync031.py | 2 +- test/pacman/tests/sync040.py | 2 +- test/pacman/tests/sync041.py | 2 +- test/pacman/tests/sync405.py | 2 +- test/pacman/tests/sync406.py | 2 +- test/pacman/tests/sync891.py | 2 +- test/pacman/tests/sync892.py | 2 +- test/pacman/tests/sync893.py | 2 +- test/pacman/tests/sync898.py | 2 +- test/pacman/tests/sync990.py | 2 +- test/pacman/tests/sync992.py | 2 +- test/pacman/tests/upgrade005.py | 2 +- test/pacman/tests/upgrade013.py | 2 +- test/pacman/tests/upgrade014.py | 2 +- test/pacman/tests/upgrade030.py | 2 +- test/pacman/tests/upgrade031.py | 2 +- test/pacman/tests/upgrade032.py | 2 +- test/pacman/tests/upgrade040.py | 2 +- test/pacman/tests/upgrade041.py | 2 +- test/pacman/tests/upgrade042.py | 2 +- test/pacman/tests/upgrade043.py | 2 +- test/pacman/tests/upgrade046.py | 2 +- test/pacman/tests/upgrade050.py | 2 +- test/pacman/tests/upgrade059.py | 2 +- test/pacman/tests/upgrade060.py | 2 +- test/pacman/tests/upgrade061.py | 2 +- test/pacman/tests/upgrade073.py | 2 +- test/pacman/tests/upgrade090.py | 2 +- test/pacman/tests/xfercommand001.py | 2 +- test/pacman/util.py | 47 ++++++++++++++++++++++++++++++------ 43 files changed, 99 insertions(+), 63 deletions(-) -- 1.8.4

5 44

[pacman-dev] [PATCH] Fix whitespacing and other issues throughout the codebase
by Jason St. John 10 Nov '13

10 Nov '13

This commit: -- replaces space-based indents with tabs per the coding standards -- removes extraneous whitespace (e.g. extra spaces between function args) -- adds missing braces for a one-line if statement Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is a resubmit based on Allan's feedback on the ML here: https://mailman.archlinux.org/pipermail/pacman-dev/2013-October/018139.html https://mailman.archlinux.org/pipermail/pacman-dev/2013-November/018143.html Note that I left the changes made to human_to_size.sh and parseopts_test.sh because Dave did not respond. contrib/paccache.sh.in | 4 +-- contrib/rankmirrors.sh.in | 2 +- lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 14 ++++----- lib/libalpm/be_package.c | 2 +- lib/libalpm/deps.c | 4 +-- lib/libalpm/diskspace.c | 2 +- lib/libalpm/dload.c | 2 +- lib/libalpm/filelist.c | 2 +- lib/libalpm/handle.h | 8 +++--- lib/libalpm/remove.c | 4 +-- lib/libalpm/signing.c | 24 ++++++++-------- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 6 ++-- scripts/makepkg.sh.in | 6 ++-- scripts/pacman-optimize.sh.in | 4 +-- src/common/util-common.c | 19 +++++++------ src/pacman/callback.c | 6 ++-- src/pacman/conf.c | 2 +- src/pacman/package.c | 4 +-- src/pacman/pacman.c | 2 +- src/pacman/query.c | 2 +- src/pacman/util.c | 2 +- test/scripts/human_to_size_test.sh | 54 +++++++++++++++++------------------ test/scripts/parseopts_test.sh | 58 +++++++++++++++++++------------------- 25 files changed, 119 insertions(+), 118 deletions(-) diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in index 2bbe726..6b8df25 100644 --- a/contrib/paccache.sh.in +++ b/contrib/paccache.sh.in @@ -298,8 +298,8 @@ pkgcount=${#candidates[*]} # copy the list, merging in any found sigs for cand in "${candidates[@]}"; do - candtemp+=("$cand") - [[ -f $cand.sig ]] && candtemp+=("$cand.sig") + candtemp+=("$cand") + [[ -f $cand.sig ]] && candtemp+=("$cand.sig") done candidates=("${candtemp[@]}") unset candtemp diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in index 5555edf..82bf9ae 100644 --- a/contrib/rankmirrors.sh.in +++ b/contrib/rankmirrors.sh.in @@ -184,7 +184,7 @@ elif [[ $FILE ]]; then fi timesarray=() -for line in "${linearray[@]}"; do +for line in "${linearray[@]}"; do if [[ $line =~ ^[[:space:]]*# ]]; then [[ $TIMESONLY ]] || echo $line elif [[ $line =~ ^[[:space:]]*Server ]]; then diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ac4e36a..54e88a9 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -649,7 +649,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, PROGRESS(handle, event, newpkg->name, 100, pkg_count, pkg_current); - /* run the post-install script if it exists */ + /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { char *scriptlet = _alpm_local_db_pkgpath(db, newpkg, "install"); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2c8c1e6..e9b0feb 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -79,17 +79,17 @@ typedef enum _alpm_pkgvalidation_t { /** Types of version constraints in dependency specs. */ typedef enum _alpm_depmod_t { - /** No version constraint */ + /** No version constraint */ ALPM_DEP_MOD_ANY = 1, - /** Test version equality (package=x.y.z) */ + /** Test version equality (package=x.y.z) */ ALPM_DEP_MOD_EQ, - /** Test for at least a version (package>=x.y.z) */ + /** Test for at least a version (package>=x.y.z) */ ALPM_DEP_MOD_GE, - /** Test for at most a version (package<=x.y.z) */ + /** Test for at most a version (package<=x.y.z) */ ALPM_DEP_MOD_LE, - /** Test for greater than some version (package>x.y.z) */ + /** Test for greater than some version (package>x.y.z) */ ALPM_DEP_MOD_GT, - /** Test for less than some version (package<x.y.z) */ + /** Test for less than some version (package<x.y.z) */ ALPM_DEP_MOD_LT } alpm_depmod_t; @@ -250,7 +250,7 @@ typedef struct _alpm_sigresult_t { /** * Signature list. Contains the number of signatures found and a pointer to an - * array of results. The array is of size count. + * array of results. The array is of size count. */ typedef struct _alpm_siglist_t { size_t count; diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 3f577ba..ce50683 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -419,7 +419,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, } config = 1; continue; - } else if(strcmp(entry_name, ".INSTALL") == 0) { + } else if(strcmp(entry_name, ".INSTALL") == 0) { newpkg->scriptlet = 1; } else if(*entry_name == '.') { /* for now, ignore all files starting with '.' that haven't diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index dd85a01..e5a0404 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -381,8 +381,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, /* 1. check upgrade list for satisfiers */ /* 2. check dblist for satisfiers */ if(causingpkg && - !find_dep_satisfier(upgrade, depend) && - !find_dep_satisfier(dblist, depend)) { + !find_dep_satisfier(upgrade, depend) && + !find_dep_satisfier(dblist, depend)) { alpm_depmissing_t *miss; char *missdepstring = alpm_dep_compute_string(depend); _alpm_log(handle, ALPM_LOG_DEBUG, "checkdeps: transaction would break '%s' dependency of '%s'\n", diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 4526e89..dcab3b0 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -357,7 +357,7 @@ int _alpm_check_downloadspace(alpm_handle_t *handle, const char *cachedir, size_t j; int error = 0; - /* resolve the cachedir path to ensure we check the right mountpoint. We + /* resolve the cachedir path to ensure we check the right mountpoint. We * handle failures silently, and continue to use the possibly unresolved * path. */ if(realpath(cachedir, resolved_cachedir) != NULL) { diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 7782f8d..1032f7c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -465,7 +465,7 @@ static int curl_download_internal(struct dload_payload *payload, payload->curlerr); /* disconnect relationships from the curl handle for things that might go out - * of scope, but could still be touched on connection teardown. This really + * of scope, but could still be touched on connection teardown. This really * only applies to FTP transfers. */ curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL); diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index f8db9a3..e6da681 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -97,7 +97,7 @@ alpm_list_t *_alpm_filelist_intersection(alpm_filelist_t *filesA, } else { /* TODO: this creates conflicts between a symlink to a directory in * one package and a real directory in the other. For example, - * lib -> /usr/lib in pkg1 and /lib in pkg2. This would be allowed + * lib -> /usr/lib in pkg1 and /lib in pkg2. This would be allowed * when installing one package at a time _provided_ pkg1 is installed * first. This will need adjusted if the order of package install can * be guaranteed to install the symlink first */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 5e84d58..e3f8055 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -52,7 +52,7 @@ do { \ struct __alpm_handle_t { /* internal usage */ - alpm_db_t *db_local; /* local db pointer */ + alpm_db_t *db_local; /* local db pointer */ alpm_list_t *dbs_sync; /* List of (alpm_db_t *) */ FILE *logstream; /* log file stream pointer */ FILE *lckstream; /* lock file stream pointer if one exists */ @@ -64,10 +64,10 @@ struct __alpm_handle_t { #endif /* callback functions */ - alpm_cb_log logcb; /* Log callback function */ - alpm_cb_download dlcb; /* Download callback function */ + alpm_cb_log logcb; /* Log callback function */ + alpm_cb_download dlcb; /* Download callback function */ alpm_cb_totaldl totaldlcb; /* Total download callback function */ - alpm_cb_fetch fetchcb; /* Download file callback function */ + alpm_cb_fetch fetchcb; /* Download file callback function */ alpm_cb_event eventcb; alpm_cb_question questioncb; alpm_cb_progress progresscb; diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 7237a56..9c3f9ef 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -672,7 +672,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "removing package %s-%s\n", pkgname, pkgver); - /* run the pre-remove scriptlet if it exists */ + /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { char *scriptlet = _alpm_local_db_pkgpath(handle->db_local, @@ -687,7 +687,7 @@ int _alpm_remove_single_package(alpm_handle_t *handle, remove_package_files(handle, oldpkg, newpkg, targ_count, pkg_count); } - /* run the post-remove script if it exists */ + /* run the post-remove script if it exists */ if(!newpkg && alpm_pkg_has_scriptlet(oldpkg) && !(handle->trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { char *scriptlet = _alpm_local_db_pkgpath(handle->db_local, diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c index 7e4d41b..b594a9b 100644 --- a/lib/libalpm/signing.c +++ b/lib/libalpm/signing.c @@ -85,27 +85,27 @@ static alpm_list_t *list_sigsum(gpgme_sigsum_t sigsum) /* The docs say this can be a bitmask...not sure I believe it, but we'll code * for it anyway and show all possible flags in the returned string. */ - /* The signature is fully valid. */ + /* The signature is fully valid. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_VALID, "valid"); - /* The signature is good. */ + /* The signature is good. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_GREEN, "green"); - /* The signature is bad. */ + /* The signature is bad. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_RED, "red"); - /* One key has been revoked. */ + /* One key has been revoked. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_REVOKED, "key revoked"); - /* One key has expired. */ + /* One key has expired. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_EXPIRED, "key expired"); - /* The signature has expired. */ + /* The signature has expired. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SIG_EXPIRED, "sig expired"); - /* Can't verify: key missing. */ + /* Can't verify: key missing. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_KEY_MISSING, "key missing"); - /* CRL not available. */ + /* CRL not available. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_MISSING, "crl missing"); - /* Available CRL is too old. */ + /* Available CRL is too old. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_CRL_TOO_OLD, "crl too old"); - /* A policy was not met. */ + /* A policy was not met. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_BAD_POLICY, "bad policy"); - /* A system error occurred. */ + /* A system error occurred. */ sigsum_test_bit(sigsum, &summary, GPGME_SIGSUM_SYS_ERROR, "sys error"); /* Fallback case */ if(!sigsum) { @@ -679,7 +679,7 @@ error: return ret; } -#else /* HAVE_LIBGPGME */ +#else /* HAVE_LIBGPGME */ int _alpm_key_in_keychain(alpm_handle_t UNUSED *handle, const char UNUSED *fpr) { return -1; diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 8d4e0e7..a795a1f 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -289,7 +289,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, if(!is_archive && !grep(filepath, script)) { /* script not found in scriptlet file; we can only short-circuit this early - * if it is an actual scriptlet file and not an archive. */ + * if it is an actual scriptlet file and not an archive. */ return 0; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 19a8612..f9fdb01 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -142,7 +142,7 @@ done: /** Copies a file. * @param src file path to copy from * @param dest file path to copy to - * @return 0 on success, 1 on error + * @return 0 on success, 1 on error */ int _alpm_copyfile(const char *src, const char *dest) { @@ -920,7 +920,7 @@ char SYMEXPORT *alpm_compute_sha256sum(const char *filename) return hex_representation(output, 32); } -/** Calculates a file's MD5 or SHA2 digest and compares it to an expected value. +/** Calculates a file's MD5 or SHA-2 digest and compares it to an expected value. * @param filepath path of the file to check * @param expected hash value to compare against * @param type digest type to use @@ -958,7 +958,7 @@ int _alpm_test_checksum(const char *filepath, const char *expected, * Does not handle sparse files on purpose for speed. * @param a * @param b - * @return + * @return */ int _alpm_archive_fgets(struct archive *a, struct archive_read_buffer *b) { diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4cb8173..387fadb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1336,8 +1336,8 @@ extract_sources() { for netfile in "${source[@]}"; do local file=$(get_filename "$netfile") if in_array "$file" "${noextract[@]}"; then - #skip source files in the noextract=() array - # these are marked explicitly to NOT be extracted + # skip source files in the noextract=() array + # these are marked explicitly to NOT be extracted continue fi local proto=$(get_protocol "$netfile") @@ -2488,7 +2488,7 @@ usage() { printf -- "$(gettext "Options:")\n" printf -- "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT" printf -- "$(gettext " -c, --clean Clean up work files after build")\n" - printf -- "$(gettext " -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/" + printf -- "$(gettext " -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/" printf -- "$(gettext " -d, --nodeps Skip all dependency checks")\n" printf -- "$(gettext " -e, --noextract Do not extract source files (use existing %s dir)")\n" "\$srcdir/" printf -- "$(gettext " -f, --force Overwrite existing package")\n" diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 47fbb49..498bd77 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -142,8 +142,8 @@ msg "$(gettext "Making and MD5sum'ing the new database...")" mkdir "$localdb.new" bsdtar -xpf "$workdir/pacman-db.tar.gz" -C "$localdb.new" if (( $? )); then - rm -rf "$workdir" - die_r "$(gettext "Untar'ing %s failed.")" "$localdb" + rm -rf "$workdir" + die_r "$(gettext "Untar'ing %s failed.")" "$localdb" fi # immediate sync following extraction should get it written continuously on HDD msg "$(gettext "Syncing database to disk...")" diff --git a/src/common/util-common.c b/src/common/util-common.c index 40623b9..e4a9de9 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -82,9 +82,9 @@ char *mdirname(const char *path) */ static size_t strnlen(const char *s, size_t max) { - register const char *p; - for(p = s; *p && max--; ++p); - return (p - s); + register const char *p; + for(p = s; *p && max--; ++p); + return (p - s); } /** Copies a string. @@ -95,14 +95,15 @@ static size_t strnlen(const char *s, size_t max) */ char *strndup(const char *s, size_t n) { - size_t len = strnlen(s, n); - char *new = (char *) malloc(len + 1); + size_t len = strnlen(s, n); + char *new = (char *) malloc(len + 1); - if(new == NULL) - return NULL; + if(new == NULL) { + return NULL; + } - new[len] = '\0'; - return (char *)memcpy(new, s, len); + new[len] = '\0'; + return (char *)memcpy(new, s, len); } #endif diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 36531a2..1d18ac3 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -158,7 +158,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) } switch(event) { case ALPM_EVENT_CHECKDEPS_START: - printf(_("checking dependencies...\n")); + printf(_("checking dependencies...\n")); break; case ALPM_EVENT_FILECONFLICTS_START: if(config->noprogressbar) { @@ -320,7 +320,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, case ALPM_QUESTION_INSTALL_IGNOREPKG: if(!config->op_s_downloadonly) { *response = yesno(_("%s is in IgnorePkg/IgnoreGroup. Install anyway?"), - alpm_pkg_get_name(data1)); + alpm_pkg_get_name(data1)); } else { *response = 1; } @@ -724,7 +724,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) fname[len] = '\0'; /* 1 space + filenamelen + 1 space + 6 for size + 1 space + 3 for label + - * + 2 spaces + 4 for rate + 1 for label + 2 for /s + 1 space + + * + 2 spaces + 4 for rate + 1 for label + 2 for /s + 1 space + * 8 for eta, gives us the magic 30 */ filenamelen = infolen - 30; /* see printf() code, we omit 'HH:' in these conditions */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index cd357ab..5b20209 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -691,7 +691,7 @@ static int setup_libalpm(void) return ret; } - /* Set GnuPG's home directory. This is not relative to rootdir, even if + /* Set GnuPG's home directory. This is not relative to rootdir, even if * rootdir is defined. Reasoning: gpgdir contains configuration data. */ config->gpgdir = config->gpgdir ? config->gpgdir : strdup(GPGDIR); ret = alpm_option_set_gpgdir(handle, config->gpgdir); diff --git a/src/pacman/package.c b/src/pacman/package.c index 78bfb50..52219ff 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -189,7 +189,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } if(from == ALPM_PKG_FROM_FILE || from == ALPM_PKG_FROM_LOCALDB) { string_display(_("Install Script :"), - alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No"), cols); + alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No"), cols); } if(from == ALPM_PKG_FROM_SYNCDB && extra) { @@ -206,7 +206,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg), cols); - string_display(_("SHA256 Sum :"), alpm_pkg_get_sha256sum(pkg), cols); + string_display(_("SHA-256 Sum :"), alpm_pkg_get_sha256sum(pkg), cols); list_display(_("Signatures :"), keys, cols); } else { list_display(_("Validated By :"), validation, cols); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index e5d16fc..df73bcf 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -601,7 +601,7 @@ static void checkargs_query(void) invalid_opt(config->op_q_deps && config->op_q_explicit, "--deps", "--explicit"); invalid_opt((config->op_q_locality & PKG_LOCALITY_NATIVE) && - (config->op_q_locality & PKG_LOCALITY_FOREIGN), + (config->op_q_locality & PKG_LOCALITY_FOREIGN), "--native", "--foreign"); } diff --git a/src/pacman/query.c b/src/pacman/query.c index 8814307..e62272a 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -170,7 +170,7 @@ static int query_fileowner(alpm_list_t *targets) } if(lstat(filename, &buf) == -1) { - /* if it is not a path but a program name, then check in PATH */ + /* 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_printf(ALPM_LOG_ERROR, _("failed to find '%s' in PATH: %s\n"), diff --git a/src/pacman/util.c b/src/pacman/util.c index 0e9a420..5960573 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1569,7 +1569,7 @@ int pm_asprintf(char **string, const char *format, ...) /* print the message using va_arg list */ va_start(args, format); if(vasprintf(string, format, args) == -1) { - pm_printf(ALPM_LOG_ERROR, _("failed to allocate string\n")); + pm_printf(ALPM_LOG_ERROR, _("failed to allocate string\n")); ret = -1; } va_end(args); diff --git a/test/scripts/human_to_size_test.sh b/test/scripts/human_to_size_test.sh index 6306137..659d78c 100755 --- a/test/scripts/human_to_size_test.sh +++ b/test/scripts/human_to_size_test.sh @@ -5,43 +5,43 @@ declare -i testcount=0 fail=0 pass=0 total=15 # source the library function lib=${1:-${PMTEST_SCRIPTLIB_DIR}human_to_size.sh} if [[ -z $lib || ! -f $lib ]]; then - echo "Bail out! human_to_size library ($lib) could not be located\n" - exit 1 + echo "Bail out! human_to_size library ($lib) could not be located\n" + exit 1 fi . "$lib" if ! type -t human_to_size >/dev/null; then - printf 'Bail out! human_to_size function not found\n' - exit 1 + printf "Bail out! human_to_size function not found\n" + exit 1 fi parse_hts() { - local input=$1 expected=$2 result - - (( ++testcount )) - - result=$(human_to_size "$1") - if [[ $result = "$expected" ]]; then - (( ++pass )) - printf "ok %d - %s\n" "$testcount" "$input" - else - (( ++fail )) - printf "not ok %d - %s\n" "$testcount" "$input" - printf '# [TEST %3s]: FAIL\n' "$testcount" - printf '# input: %s\n' "$input" - printf '# output: %s\n' "$result" - printf '# expected: %s\n' "$expected" - fi + local input=$1 expected=$2 result + + (( ++testcount )) + + result=$(human_to_size "$1") + if [[ $result = "$expected" ]]; then + (( ++pass )) + printf "ok %d - %s\n" "$testcount" "$input" + else + (( ++fail )) + printf "not ok %d - %s\n" "$testcount" "$input" + printf '# [TEST %3s]: FAIL\n' "$testcount" + printf '# input: %s\n' "$input" + printf '# output: %s\n' "$result" + printf '# expected: %s\n' "$expected" + fi } summarize() { - if (( !fail )); then - printf '# All %s tests successful\n\n' "$testcount" - exit 0 - else - printf '# %s of %s tests failed\n\n' "$fail" "$testcount" - exit 1 - fi + if (( !fail )); then + printf '# All %s tests successful\n\n' "$testcount" + exit 0 + else + printf '# %s of %s tests failed\n\n' "$fail" "$testcount" + exit 1 + fi } trap 'summarize' EXIT diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index 5ff4bc5..b0468cf 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -5,14 +5,14 @@ declare -i testcount=0 pass=0 fail=0 total=25 # source the library function lib=${1:-${PMTEST_SCRIPTLIB_DIR}parseopts.sh} if [[ -z $lib || ! -f $lib ]]; then - printf "Bail out! parseopts library ($lib) could not be located\n" - exit 1 + printf "Bail out! parseopts library ($lib) could not be located\n" + exit 1 fi . "$lib" if ! type -t parseopts >/dev/null; then - printf 'Bail out! parseopts function not found\n' - exit 1 + printf "Bail out! parseopts function not found\n" + exit 1 fi # borrow opts from makepkg @@ -24,38 +24,38 @@ OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean:' 'cleanall' 'nodeps' 'noconfirm' 'noprogressbar') parse() { - local result=$1 tokencount=$2; shift 2 + local result=$1 tokencount=$2; shift 2 - (( ++testcount )) - parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@" 2>/dev/null - test_result "$result" "$tokencount" "$*" "${OPTRET[@]}" - unset OPTRET + (( ++testcount )) + parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@" 2>/dev/null + test_result "$result" "$tokencount" "$*" "${OPTRET[@]}" + unset OPTRET } test_result() { - local result=$1 tokencount=$2 input=$3; shift 3 - - if [[ $result = "$*" ]] && (( tokencount == $# )); then - (( ++pass )) - printf 'ok %d - %s\n' "$testcount" "$input" - else - printf 'not ok %d - %s\n' "$testcount" "$input" - printf '# [TEST %3s]: FAIL\n' "$testcount" - printf '# input: %s\n' "$input" - printf '# output: %s (%s tokens)\n' "$*" "$#" - printf '# expected: %s (%s tokens)\n' "$result" "$tokencount" - (( ++fail )) - fi + local result=$1 tokencount=$2 input=$3; shift 3 + + if [[ $result = "$*" ]] && (( tokencount == $# )); then + (( ++pass )) + printf 'ok %d - %s\n' "$testcount" "$input" + else + printf 'not ok %d - %s\n' "$testcount" "$input" + printf '# [TEST %3s]: FAIL\n' "$testcount" + printf '# input: %s\n' "$input" + printf '# output: %s (%s tokens)\n' "$*" "$#" + printf '# expected: %s (%s tokens)\n' "$result" "$tokencount" + (( ++fail )) + fi } summarize() { - if (( !fail )); then - printf '# All %s tests successful\n\n' "$testcount" - exit 0 - else - printf '# %s of %s tests failed\n\n' "$fail" "$testcount" - exit 1 - fi + if (( !fail )); then + printf '# All %s tests successful\n\n' "$testcount" + exit 0 + else + printf '# %s of %s tests failed\n\n' "$fail" "$testcount" + exit 1 + fi } trap 'summarize' EXIT -- 1.8.4.2

2 1

[pacman-dev] [PATCH] Replace "echo" command with "printf" in human_to_size_test.sh
by Jason St. John 10 Nov '13

10 Nov '13

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is yet anoter resubmit. I forgot to add the printf formatter in the previous patch. test/scripts/human_to_size_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/human_to_size_test.sh b/test/scripts/human_to_size_test.sh index 659d78c..692b89d 100755 --- a/test/scripts/human_to_size_test.sh +++ b/test/scripts/human_to_size_test.sh @@ -5,7 +5,7 @@ declare -i testcount=0 fail=0 pass=0 total=15 # source the library function lib=${1:-${PMTEST_SCRIPTLIB_DIR}human_to_size.sh} if [[ -z $lib || ! -f $lib ]]; then - echo "Bail out! human_to_size library ($lib) could not be located\n" + printf "Bail out! human_to_size library (%s) could not be located\n" "${lib}" exit 1 fi . "$lib" -- 1.8.4.2

2 2

[pacman-dev] [PATCH] Replace "echo" command with "printf" in human_to_size_test.sh
by Jason St. John 08 Nov '13

08 Nov '13

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is a resubmit. Dave suggested using "printf" instead of "echo" here: https://mailman.archlinux.org/pipermail/pacman-dev/2013-November/018183.html test/scripts/human_to_size_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/human_to_size_test.sh b/test/scripts/human_to_size_test.sh index 659d78c..692b89d 100755 --- a/test/scripts/human_to_size_test.sh +++ b/test/scripts/human_to_size_test.sh @@ -5,7 +5,7 @@ declare -i testcount=0 fail=0 pass=0 total=15 # source the library function lib=${1:-${PMTEST_SCRIPTLIB_DIR}human_to_size.sh} if [[ -z $lib || ! -f $lib ]]; then - echo "Bail out! human_to_size library ($lib) could not be located\n" + printf "Bail out! human_to_size library ($lib) could not be located\n" exit 1 fi . "$lib" -- 1.8.4.2

2 1

[pacman-dev] [PATCH] Add missing "-e" switch to Bash's "echo" command in human_to_size_test.sh
by Jason St. John 08 Nov '13

08 Nov '13

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- Andrew pointed out that Bash's "echo" command needs the "-e" switch to handle escapes, which reminded me of this. test/scripts/human_to_size_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/human_to_size_test.sh b/test/scripts/human_to_size_test.sh index 659d78c..692b89d 100755 --- a/test/scripts/human_to_size_test.sh +++ b/test/scripts/human_to_size_test.sh @@ -5,7 +5,7 @@ declare -i testcount=0 fail=0 pass=0 total=15 # source the library function lib=${1:-${PMTEST_SCRIPTLIB_DIR}human_to_size.sh} if [[ -z $lib || ! -f $lib ]]; then - echo "Bail out! human_to_size library ($lib) could not be located\n" + echo -e "Bail out! human_to_size library ($lib) could not be located\n" exit 1 fi . "$lib" -- 1.8.4.2

2 2

[pacman-dev] [PATCH] Fix typo in pacman-optimize
by Jason St. John 08 Nov '13

08 Nov '13

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- "cannot" is the preferred spelling. Only 1 instance of "can not" exists in pacman. Note: This is a resubmit based on Allan's feedback on the ML here: https://mailman.archlinux.org/pipermail/pacman-dev/2013-October/018139.html scripts/pacman-optimize.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 498bd77..d13ce0e 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -122,7 +122,7 @@ fi touch "$lockfile" workdir=$(mktemp -d "${TMPDIR:-/tmp}/pacman-optimize.XXXXXXXXXX") || - die_r "$(gettext "Can not create temp directory for database building.")\n" >&2 + die_r "$(gettext "Cannot create temporary directory for database building.")\n" >&2 # step 1: sum the old db msg "$(gettext "MD5sum'ing the old database...")" -- 1.8.4.2

1 0

[pacman-dev] [PATCH] Fix leading whitespace in makepkg
by Jason St. John 08 Nov '13

08 Nov '13

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is a resubmit based on Allan's feedback here: https://mailman.archlinux.org/pipermail/pacman-dev/2013-October/018139.html scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4cb8173..50dcbde 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2488,7 +2488,7 @@ usage() { printf -- "$(gettext "Options:")\n" printf -- "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT" printf -- "$(gettext " -c, --clean Clean up work files after build")\n" - printf -- "$(gettext " -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/" + printf -- "$(gettext " -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/" printf -- "$(gettext " -d, --nodeps Skip all dependency checks")\n" printf -- "$(gettext " -e, --noextract Do not extract source files (use existing %s dir)")\n" "\$srcdir/" printf -- "$(gettext " -f, --force Overwrite existing package")\n" -- 1.8.4.2

1 1