- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Don't check diskspace when using --dbonly
by Dan McGee 21 Dec '11

21 Dec '11

Mostly a waste of time. Sure, we no longer make sure your pacman database partition has enough space, but if you are using this option you better know what you are doing anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 534499a..0c6ec9e 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1180,7 +1180,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) } /* check available disk space */ - if(handle->checkspace) { + if(handle->checkspace && !(trans->flags & ALPM_TRANS_FLAG_DBONLY)) { EVENT(handle, ALPM_EVENT_DISKSPACE_START, NULL, NULL); _alpm_log(handle, ALPM_LOG_DEBUG, "checking available disk space\n"); -- 1.7.8

1 0

[pacman-dev] [PATCH 1/3] contrib/*: Hardcode program names
by Lukas Fleischer 13 Dec '11

13 Dec '11

Add a read-only variable "$myname" to every contrib script and hardcode program names instead of relying on "$0". The variable name "$myname" was chosen because it is already used in pacman and because we use "$myver" to specify the program version in the official scripts. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- contrib/bacman.in | 14 +++++++------- contrib/paccache.in | 6 ++++-- contrib/pacdiff.in | 10 ++++++---- contrib/paclist.in | 8 +++++--- contrib/paclog-pkglist.in | 6 ++++-- contrib/pacscripts.in | 10 +++++----- contrib/pacsearch.in | 10 +++++----- 7 files changed, 36 insertions(+), 28 deletions(-) diff --git a/contrib/bacman.in b/contrib/bacman.in index c55d716..00d0691 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -23,7 +23,7 @@ shopt -s extglob shopt -s nullglob -readonly progname="bacman" +declare -r myname='bacman' readonly progver="0.2.1" # @@ -31,8 +31,8 @@ readonly progver="0.2.1" # usage() { echo "This program recreates a package using pacman's db and system files" - echo "Usage: $progname <installed package name>" - echo "Example: $progname kernel26" + echo "Usage: $myname <installed package name>" + echo "Example: $myname kernel26" } if (( $# != 1 )); then @@ -46,7 +46,7 @@ if [[ $1 == "--help" || $1 == "-h" ]]; then fi if [[ $1 == "--version" || $1 == "-v" ]]; then - echo "$progname version $progver" + echo "$myname version $progver" echo "Copyright (C) 2008 locci" exit 0 fi @@ -61,7 +61,7 @@ if (( EUID )); then /usr/bin/fakeroot -u -- "$0" "$@" exit $? else - echo "WARNING: installing fakeroot or running ${progname} as root is required to" + echo "WARNING: installing fakeroot or running $myname as root is required to" echo " preserve the ownership permissions of files in some packages" echo "" fi @@ -151,7 +151,7 @@ while read i; do echo "" echo "ERROR: unable to add /$i to the package" echo " If your user does not have permssion to read this file then" - echo " you will need to run $progname as root" + echo " you will need to run $myname as root" rm -rf "$work_dir" exit 1 fi @@ -177,7 +177,7 @@ pkg_size=$(du -sk | awk '{print $1 * 1024}') # TODO adopt makepkg's write_pkginfo() into this or scripts/library # echo Generating .PKGINFO metadata... -echo "# Generated by $progname $progver" > .PKGINFO +echo "# Generated by $myname $progver" > .PKGINFO if [[ $INFAKEROOT == "1" ]]; then echo "# Using $(fakeroot -v)" >> .PKGINFO fi diff --git a/contrib/paccache.in b/contrib/paccache.in index eae547d..847d44f 100755 --- a/contrib/paccache.in +++ b/contrib/paccache.in @@ -20,6 +20,8 @@ shopt -s extglob +declare -r myname='paccache' + declare -a candidates=() cmdopts=() whitelist=() blacklist=() declare -i delete=0 dryrun=0 filecount=0 move=0 needsroot=0 totalsaved=0 verbose=0 declare cachedir=@localstatedir@/cache/pacman/pkg delim=$'\n' keep=3 movedir= scanarch= @@ -174,9 +176,9 @@ summarize() { usage() { cat <<EOF -usage: ${0##*/} <operation> [options] [targets...] +usage: $myname <operation> [options] [targets...] -${0##*/} is a flexible pacman cache cleaning utility, which has numerous +$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. diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in index 3f26f38..79cf809 100755 --- a/contrib/pacdiff.in +++ b/contrib/pacdiff.in @@ -17,17 +17,19 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +declare -r myname='pacdiff' + diffprog=${DIFFPROG:-vimdiff} diffsearchpath=${DIFFSEARCHPATH:-/etc} locate=0 usage() { - echo "pacdiff : a simple pacnew/pacorig/pacsave updater" - echo "Usage : pacdiff [-l]" - echo " -l/--locate makes pacdiff use locate rather than find" + echo "$myname : a simple pacnew/pacorig/pacsave updater" + echo "Usage : $myname [-l]" + echo " -l/--locate makes $myname use locate rather than find" echo " DIFFPROG variable allows to override the default vimdiff" echo " DIFFSEARCHPATH allows to override the default /etc path" - echo "Example : DIFFPROG=meld DIFFSEARCHPATH=\"/boot /etc /usr\" pacdiff" + echo "Example : DIFFPROG=meld DIFFSEARCHPATH=\"/boot /etc /usr\" $myname" } cmd() { diff --git a/contrib/paclist.in b/contrib/paclist.in index 06b06f2..8623049 100755 --- a/contrib/paclist.in +++ b/contrib/paclist.in @@ -17,6 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +declare -r myname='paclist' + export TEXTDOMAIN='pacman' export TEXTDOMAINDIR='/usr/share/locale' @@ -28,9 +30,9 @@ if ! type gettext &>/dev/null; then fi if [[ -z $1 || $1 = -@(h|-help) ]]; then - printf '%s - List all packages installed from a given repo\n' "${0##*/}" - printf 'Usage: %s <repo>\n' "${0##*/}" - printf 'Example: %s testing\n' "${0##*/}" + printf '%s - List all packages installed from a given repo\n' "$myname" + printf 'Usage: %s <repo>\n' "$myname" + printf 'Example: %s testing\n' "$myname" exit 1 fi diff --git a/contrib/paclog-pkglist.in b/contrib/paclog-pkglist.in index 27dfd30..0b27bf3 100755 --- a/contrib/paclog-pkglist.in +++ b/contrib/paclog-pkglist.in @@ -17,14 +17,16 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +declare -r myname='paclog-pkglist' + export TEXTDOMAIN='pacman' export TEXTDOMAINDIR='/usr/share/locale' declare logfile=${1:-@localstatedir@/log/pacman.log} if [[ $1 ]]; then if [[ $1 = -@(h|-help) ]]; then - printf 'usage: %s [pacman log]\n' "${0##*/}" - printf 'example: %s @localstatedir@/log/pacman.log\n' "${0##*/}" + printf 'usage: %s [pacman log]\n' "$myname" + printf 'example: %s @localstatedir@/log/pacman.log\n' "$myname" printf '\ndefaults to: @localstatedir@/log/pacman.log\n' exit 0 elif [[ ! -e $logfile ]]; then diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index 37d3fea..967f782 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -24,7 +24,7 @@ set -o nounset set -o errexit -progname=$(basename $0) +declare -r myname='pacscripts' progver="0.4" conf="@sysconfdir@/pacman.conf" @@ -47,14 +47,14 @@ error() { usage() { echo "This program prints out the {pre,post}_{install,remove,upgrade} scripts" echo "of a given package." - echo "Usage: $progname pkgname|pkgfile" + 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: $progname gconf-editor" - echo "Example: $progname gconf-editor-2.24.1-1-x86_64.pkg.tar.gz" + echo "Example: $myname gconf-editor" + echo "Example: $myname gconf-editor-2.24.1-1-x86_64.pkg.tar.gz" } spacman() { @@ -127,6 +127,6 @@ fi case "$1" in --help|-h) usage; exit 0 ;; - --version|-v) echo "$progname version $progver"; exit 0 ;; + --version|-v) echo "$myname version $progver"; exit 0 ;; *) print_scriptlet $1 ;; esac diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index db9d6ad..794110e 100755 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -24,13 +24,13 @@ use strict; use warnings; -my $progname = "pacsearch"; +my $myname = 'pacsearch'; my $version = "2.0"; if ($#ARGV lt 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") { - print "$progname - Add color and install information to a pacman -Ss search\n"; - print "Usage: $progname <pattern>\n"; - print "Example: $progname ^gnome\n"; + print "$myname - Add color and install information to a pacman -Ss search\n"; + print "Usage: $myname <pattern>\n"; + print "Example: $myname ^gnome\n"; if ($#ARGV lt 0) { exit 1; } @@ -38,7 +38,7 @@ if ($#ARGV lt 0 || $ARGV[0] eq "--help" || $ARGV[0] eq "-h") { } if ($ARGV[0] eq "--version" || $ARGV[0] eq "-v") { - print "$progname version $version\n"; + print "$myname version $version\n"; print "Copyright (C) 2006-2011 Dan McGee\n"; exit 0; } -- 1.7.8

3 11

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-84-g2a4df07
by dan＠archlinux.org 12 Dec '11

12 Dec '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 2a4df070c360bfe31d99e232b75bdea06949245f (commit) via 370c873be54a6ef74f86b5e77ff722f766ebf707 (commit) via 8c8f04371745dad0bafcea14b38b4570e0b24a31 (commit) via 67290441b80fa813a472767353095425c78805af (commit) via 3d4656c0204956847a62c95b0f28747d7a0c2c05 (commit) via b75fac5be31d6056e78fd29a0548cc3e6275a1b8 (commit) via 5f0df423033c94e8ae52ca642284bf6a50fa9bbb (commit) via 1a1f5540a4533ea41038128026c75fe023410a99 (commit) via 074cf4cb951b85b95e706df77b8bf01cbd84d35f (commit) via 62fa0c7d8d8cbb449e1e014eacd895011685a093 (commit) via 781af8f91b5c8c6b804a0dcc0a47a7f8f018c6de (commit) via dacda1f6b3f2122d7d54cda9ed7d620301595ef1 (commit) from b5225165c070b30f8ec5a71ff5a12ea43102c3da (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 2a4df070c360bfe31d99e232b75bdea06949245f Merge: 370c873 6729044 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 12 14:07:44 2011 -0600 Merge branch 'maint' commit 370c873be54a6ef74f86b5e77ff722f766ebf707 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 12 13:05:10 2011 -0600 Calculate root length only once when checking for file conflicts It is quite easy to hoist this potentially repeated computation out of the loop; even if we don't end up using it, it is super cheap to do it only once. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8c8f04371745dad0bafcea14b38b4570e0b24a31 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 13 18:19:28 2011 -0500 lib/conflict: save strlen call by reusing snprintf return The return should probably be checked to ensure its not longer than PATH_MAX, but I have no idea what the correct behavior is when that happens. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d4656c0204956847a62c95b0f28747d7a0c2c05 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Dec 6 23:37:32 2011 -0500 code syntax cleanup As per HACKING file, we use 'CTRL(' rather than 'CTRL (' Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5f0df423033c94e8ae52ca642284bf6a50fa9bbb Author: Dave Reisner <d(a)falconindy.com> Date: Sat Dec 10 23:10:49 2011 -0500 makepkg: split source elements when looking for sigs Allows renamed .asc/.sig files to be still discovered by makepkg. This is needed for a package such as PuTTY, which provides abnormally named sig files (.DSA and .RSA) which are valid input for gpg --verify. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1a1f5540a4533ea41038128026c75fe023410a99 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 12 10:53:14 2011 -0600 pacman: process all sync targets before exiting on error If someone specifies a bogus line such as pacman -S baz adsf/boo base-devel we are better off trying to process all targets and showing all relevant errors before exiting. This is easier in -U and -R operations where we aren't dealing with groups, but here we attempt to skip group selection once we know a target has errored to avoid cluttering the output and hiding the real problem. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 074cf4cb951b85b95e706df77b8bf01cbd84d35f Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 12 10:50:27 2011 -0600 pacman: process all targets on upgrade operation If an early target fails, we stopped processing the rest of the list. We should continue all the way through and show relevant errors for each target if possible, and error out only at the end. We do process all targets to check for URLs first and will error out if some could not be processed; we then do a second loop and try to load each target specified on the command line. This mirrors a patch by Allan to do the same for removal operations. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 62fa0c7d8d8cbb449e1e014eacd895011685a093 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 10 20:08:24 2011 +1000 pacman: list all unknown targets on removal operation On a removal operation, pacman currently reports an error for the package that is not found in the database and then exists. Adjust so that all unknown packages are reported. Before: > pacman -R foo bar error: 'foo': target not found After: > pacman -R foo bar error: 'foo': target not found error: 'bar': target not found Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 781af8f91b5c8c6b804a0dcc0a47a7f8f018c6de Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 7 12:33:41 2011 -0600 Use automake verbose helpers in custom make rules This converts our script generation to use the built-in AM_V_GEN macro, which honors the V= setting passed to make and allows one to see the full command if they truly desire. The AM_V_at macro is also used in place of an explicit @ so verbose-mode compiles show all commands being run. We can also use these two macros in doc generation to quiet it down to the level we expect. Other minor changes: * a pointless test call is removed in test/pacman/tests/ * sed is used instead of dos2unix as we depend on it anyway * consecutive chmod calls are reduced to a single call (e.g., '+x,a-x') Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dacda1f6b3f2122d7d54cda9ed7d620301595ef1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 8 09:15:41 2011 -0600 Make automake generate silent rules by default This will require you to pass 'V=1' if you want the previous, more verbose output. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 3 +- contrib/.gitignore | 1 + contrib/Makefile.am | 24 +++++++++--------- contrib/paccache.in | 2 +- contrib/pacsysclean.in | 50 +++++++++++++++++++++++++++++++++++++++++ doc/Makefile.am | 16 +++++++----- etc/Makefile.am | 7 ++--- lib/libalpm/conflict.c | 13 ++++++---- lib/libalpm/deps.c | 2 +- lib/libalpm/util.c | 26 ++++++++++---------- scripts/Makefile.am | 10 ++----- scripts/makepkg.sh.in | 4 +- src/pacman/callback.c | 4 +- src/pacman/conf.c | 8 +++--- src/pacman/pacman.c | 2 +- src/pacman/remove.c | 5 +++- src/pacman/sync.c | 40 ++++++++++++++++++++++---------- src/pacman/upgrade.c | 20 ++++++++++++---- src/pacman/util.c | 6 ++-- test/pacman/tests/Makefile.am | 10 +++----- 20 files changed, 165 insertions(+), 88 deletions(-) create mode 100755 contrib/pacsysclean.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-11-g6729044
by dan＠archlinux.org 12 Dec '11

12 Dec '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 67290441b80fa813a472767353095425c78805af (commit) from b75fac5be31d6056e78fd29a0548cc3e6275a1b8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: contrib/paccache.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-10-gb75fac5
by dan＠archlinux.org 12 Dec '11

12 Dec '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 b75fac5be31d6056e78fd29a0548cc3e6275a1b8 (commit) from 6a1d3948a670184f01a697efe55b91b4ccdcb51d (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 b75fac5be31d6056e78fd29a0548cc3e6275a1b8 Author: Eric Bélanger <snowmaniscool(a)gmail.com> Date: Mon Nov 21 17:21:24 2011 -0500 pacsysclean: Add new contrib script pacsysclean sort installed packages by decreasing installed size. It's useful for finding large unused package when doing system clean-up. This script is an improved version of other similar scripts posted on the forums. Thanks goes to Dan for fixing and improving my original script. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/.gitignore | 1 + contrib/Makefile.am | 5 +++- contrib/pacsysclean.in | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletions(-) create mode 100755 contrib/pacsysclean.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] sync: avoid checking file conflicts with --dbonly
by Dave Reisner 12 Dec '11

12 Dec '11

Scratches my own itch from FS#25667 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3817ec8..534499a 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1160,7 +1160,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) trans->state = STATE_COMMITING; /* fileconflict check */ - if(!(trans->flags & ALPM_TRANS_FLAG_FORCE)) { + if(!(trans->flags & (ALPM_TRANS_FLAG_FORCE|ALPM_TRANS_FLAG_DBONLY))) { EVENT(handle, ALPM_EVENT_FILECONFLICTS_START, NULL, NULL); _alpm_log(handle, ALPM_LOG_DEBUG, "looking for file conflicts\n"); -- 1.7.7.4

4 4

[pacman-dev] [PATCH] pacman: list all unknown targets on removal operation
by Allan McRae 12 Dec '11

12 Dec '11

On a removal operation, pacman currently reports an error for the package that is not found in the database and then exists. Adjust so that all unknown packages are reported. Before: > pacman -R foo bar error: 'foo': target not found After: > pacman -R foo bar error: 'foo': target not found error: 'bar': target not found Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/remove.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index f56c1ec..b6da7c3 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -104,10 +104,13 @@ int pacman_remove(alpm_list_t *targets) } if(remove_target(targ) == -1) { retval = 1; - goto cleanup; } } + if(retval == 1) { + goto cleanup; + } + /* Step 2: prepare the transaction based on its type, targets and flags */ if(alpm_trans_prepare(config->handle, &data) == -1) { alpm_errno_t err = alpm_errno(config->handle); -- 1.7.8

3 4

[pacman-dev] [PATCH] makepkg: split source elements when looking for sigs
by Dave Reisner 11 Dec '11

11 Dec '11

Allows renamed .asc/.sig files to be still discovered by makepkg. This is needed for a package such as PuTTY, which provides abnormally named sig files (.DSA and .RSA) which are valid input for gpg --verify. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Related: do we want to natively support .SIG and .ASC as well? Or would we be content with this patch as a workaround for "abnormal" sig files like that? scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a0a94fe..a4a3d13 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -331,10 +331,10 @@ in_array() { return 1 # Not Found } -source_has_signatures(){ +source_has_signatures() { local file for file in "${source[@]}"; do - if [[ $file = *.@(sig?(n)|asc) ]]; then + if [[ ${file%%::*} = *.@(sig?(n)|asc) ]]; then return 0 fi done -- 1.7.8

3 4

[pacman-dev] [PATCH 3/3] makepkg: Making git support do auto-clone/fetch.
by John Sumsion 10 Dec '11

10 Dec '11

>From 4a26847342e3b33217f0682af4e350b71098befe Mon Sep 17 00:00:00 2001 From: John Sumsion <john(a)sumsion.org> Date: Sat, 3 Dec 2011 09:36:52 -0700 Subject: [PATCH 3/3] makepkg: Making git support do auto-clone/fetch. Patterned after the hg logic. Signed-off-by: John Sumsion <john(a)sumsion.org> --- scripts/makepkg.sh.in | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a5eca0..83337fe 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1701,8 +1701,18 @@ devel_check() { return 0 fi msg "$(gettext "Determining latest %s revision...")" 'git' + if [[ -d ./src/$_gitname ]] ; then + cd ./src/$_gitname + git remote update + else + [[ ! -d ./src/ ]] && mkdir ./src/ + git clone $_gitroot/$_gitname ./src/$_gitname + cd ./src/$_gitname + fi newpkgver=${_gitref:-origin/master} + git reset --hard ${newpkgver} newpkgver=$(git describe --always ${newpkgver} | sed -e 's/-/_/g') + cd ../../ elif [[ -n ${_svntrunk} && -n ${_svnmod} ]] ; then if ! type -p svn >/dev/null; then warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "svn" "svn" -- 1.7.8

3 2

[pacman-dev] [PATCH] Make automake generate silent rules by default
by Dan McGee 08 Dec '11

08 Dec '11

This will require you to pass 'V=1' if you want the previous, more verbose output. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 39e34c8..fb1e0b3 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,8 @@ AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([silent-rules]) +AM_INIT_AUTOMAKE([1.11]) +AM_SILENT_RULES([yes]) LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision LIB_VERSION_INFO="lib_current:lib_revision:lib_age" -- 1.7.8

1 0