FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 07-15-2012, 02:18 PM
Allan McRae
 
Default makepkg: add --holdver to control VCS source updating

Do not update VCS sources if --holdver is used. If the VCS checkout
is not present, it will still be downloaded.

Signed-off-by: Allan McRae <allan@archlinux.org>
---
scripts/makepkg.sh.in | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 8ab621a..46496fa 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -59,6 +59,7 @@ DEP_BIN=0
FORCE=0
INFAKEROOT=0
GENINTEG=0
+HOLDVER=0
SKIPCHECKSUMS=0
SKIPPGPCHECK=0
INSTALL=0
@@ -399,7 +400,7 @@ download_git() {
plain "$(gettext "Aborting...")"
exit 1
fi
- else
+ elif (( ! HOLDVER )); then
msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git"
cd_safe "$folder"
if ! git fetch --all -p; then
@@ -474,7 +475,7 @@ download_svn() {
plain "$(gettext "Aborting...")"
exit 1
fi
- else
+ elif (( ! HOLDVER )); then
msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn"
cd_safe "$folder"
if ! svn update; then
@@ -2106,6 +2107,7 @@ usage() {
printf -- "$(gettext " --asroot Allow %s to run as root user")
" "makepkg"
printf -- "$(gettext " --check Run the %s function in the %s")
" "check()" "$BUILDSCRIPT"
printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")
" "$confdir/makepkg.conf"
+ printf -- "$(gettext " --holdver Do not update VCS sources")
"
printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")
" "gpg"
printf -- "$(gettext " --nocheck Do not run the %s function in the %s")
" "check()" "$BUILDSCRIPT"
printf -- "$(gettext " --nosign Do not create a signature for the package")
"
@@ -2148,7 +2150,7 @@ ARGLIST=("$@")
# Parse Command Line Options.
OPT_SHORT="AcdefFghiLmop:rRsSV"
OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg'
- 'help' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor'
+ 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor'
'nocheck' 'nodeps' 'noextract' 'nosign' 'pkg:' 'repackage' 'rmdeps'
'skipchecksums' 'skipinteg' 'skippgpcheck' 'skippgpcheck' 'sign'
'source' 'syncdeps' 'version')
@@ -2181,6 +2183,7 @@ while true; do
-f|--force) FORCE=1 ;;
-F) INFAKEROOT=1 ;;
-g|--geninteg) GENINTEG=1 ;;
+ --holdver) HOLDVER=1 ;;
-i|--install) INSTALL=1 ;;
--key) shift; GPGKEY=$1 ;;
-L|--log) LOGGING=1 ;;
--
1.7.11.2
 

Thread Tools




All times are GMT. The time now is 01:17 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org