Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-08 23:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Exit 0 when showing help, and support -h.

Browse Source
This commit is contained in:
Stefano Rivera 2011-04-24 16:01:42 +02:00
parent dfc7a2ce26
commit ebe04d88b0
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ ubuntu-dev-tools (0.123) UNRELEASED; urgency=low
* mk-sbuild: * mk-sbuild:
- Disable daemons with a policy-rc.d script (like pbuilder does) - Disable daemons with a policy-rc.d script (like pbuilder does)
- Move package installation after option parsing. - Move package installation after option parsing.
- Exit 0 when showing help, and support -h.
-- Stefano Rivera <stefanor@debian.org> Sun, 24 Apr 2011 12:45:31 +0200 -- Stefano Rivera <stefanor@debian.org> Sun, 24 Apr 2011 12:45:31 +0200

11
mk-sbuild
View File

@ -70,14 +70,17 @@ function usage()
echo " DEBOOTSTRAP_EXCLUDE Excluded packages (same as --debootstrap-exclude)" echo " DEBOOTSTRAP_EXCLUDE Excluded packages (same as --debootstrap-exclude)"
echo " TEMPLATE_SOURCES A template for sources.list" echo " TEMPLATE_SOURCES A template for sources.list"
echo " TEMPLATE_SCHROOTCONF A template for schroot.conf stanza" echo " TEMPLATE_SCHROOTCONF A template for schroot.conf stanza"
exit 1 if [ -z "$1" ]; then
exit 1
fi
exit $1
} }
if [ -z "$1" ]; then if [ -z "$1" ]; then
usage usage
fi fi
OPTS=`getopt -o '' --long "help,debug,skip-updates,arch:,name:,source-template:,debootstrap-mirror:,debootstrap-include:,debootstrap-exclude:,personality:,distro:,vg:,type:" -- "$@"` OPTS=`getopt -o 'h' --long "help,debug,skip-updates,arch:,name:,source-template:,debootstrap-mirror:,debootstrap-include:,debootstrap-exclude:,personality:,distro:,vg:,type:" -- "$@"`
eval set -- "$OPTS" eval set -- "$OPTS"
VG="" VG=""
@ -145,8 +148,8 @@ while :; do
shift shift
break break
;; ;;
--help|*) -h|--help|*)
usage usage 0
;; ;;
esac esac
done done

1
ubuntutools/test/test_help.py
View File

@ -32,7 +32,6 @@ BLACKLIST = {
'grep-merges': 'No Help', 'grep-merges': 'No Help',
'lp-project-upload': 'Returns non-zero after help. ' 'lp-project-upload': 'Returns non-zero after help. '
'Leaving u-d-t in LP: #524680', 'Leaving u-d-t in LP: #524680',
'mk-sbuild': 'Fires up apt-get before showing help',
'pbuilder-dist-simple': 'No Help', 'pbuilder-dist-simple': 'No Help',
'setup-packaging-environment': 'Throws Error', 'setup-packaging-environment': 'Throws Error',
'submittodebian': 'No Help', 'submittodebian': 'No Help',