Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4db3c7fd5ee3e16c87eea5e2b26b062425bfb3de
commit 4db3c7fd5ee3e16c87eea5e2b26b062425bfb3de Author: Michel Hermier <[email protected]> Date: Sun Dec 2 11:19:32 2012 +0100 scripts/makepkg * Fix command lines handling. * Remove --chroot_basedir this is a thinko. diff --git a/scripts/makepkg b/scripts/makepkg index 3243ab7..88ae53f 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -2034,7 +2034,6 @@ makepkg_chroot() { -f|--force) force=1 ;; -h|--help) makepkg_chroot_usage; return 0 ;; -u|--unlocked) locked=0 ;; - --chroot_basedir) CHROOT_BASEDIR="$2"; consumed=2 ;; --nochroot) chroot=0 ;; --userspec) userspec="$2"; consumed=2 ;; # special options @@ -2143,7 +2142,6 @@ makepkg_chroot_clean() { -f|--force) force=1 ;; -h|--help) makepkg_chroot_clean_usage; return 0 ;; -u|--unlocked) locked=0 ;; - --chroot_basedir) CHROOT_BASEDIR="$2"; consumed=2 ;; # special options --) shift; break ;; # End of options --*|-?) makepkg_chroot_clean_usage; return 1 ;; @@ -2250,7 +2248,6 @@ makepkg_chroot_create() { -h|--help) makepkg_lock_usage; return 0 ;; -r|--repository) repo_list+=("$2") ; consumed=2 ;; -u|--unlocked) locked=0 ;; - --chroot_basedir) CHROOT_BASEDIR="$2"; consumed=2 ;; # special options --) shift; break ;; # End of options --*|-?) makepkg_lock_usage; return 1 ;; @@ -2306,7 +2303,6 @@ makepkg_chroot_list() { case "$1" in -h|--help) makepkg_list_usage; return 0 ;; -u|--unlocked) locked=0 ;; - --chroot_basedir) CHROOT_BASEDIR="$2"; consumed=2 ;; # special options --) shift; break ;; # End of options --*|-?) makepkg_list_usage; return 1 ;; @@ -2365,6 +2361,7 @@ makepkg_chroot_lock() { consumed=1 case "$1" in -h|--help) makepkg_lock_usage; return 0 ;; + --chroot_basedir) CHROOT_BASEDIR="$2"; consumed=2 ;; # special options --) shift; break ;; # End of options --*|-?) makepkg_lock_usage; return 1 ;; @@ -2409,8 +2406,9 @@ makepkg_chroot_unlock_usage() { $ECHO "Usage: $0 chroot_unlock [OPTIONS] [--] CHROOT_NAME" $ECHO $ECHO "Options for chroot_unlock command:" - $ECHO " -f, --force Skip the sanity checks" +# $ECHO " -f, --force Skip the sanity checks" $ECHO " -h, --help This help" +# $ECHO " -u, --unlocked Do not lock CHROOT_BASEDIR, result may be inacurate" } makepkg_chroot_unlock() { @@ -2421,6 +2419,7 @@ makepkg_chroot_unlock() { consumed=1 case "$1" in -h|--help) makepkg_unlock_usage; return 0 ;; + --chroot_basedir) CHROOT_BASEDIR="$2"; consumed=2 ;; # special options --) shift; break ;; # End of options --*|-?) makepkg_unlock_usage; return 1 ;; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
