From: Marius Mauch Date: Sat, 9 Feb 2008 23:15:25 +0000 (-0000) Subject: reapply repoman typo fix X-Git-Tag: v2.2_pre1 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1539221283a60f1b0a17c56d325b9d9ea25ab806;p=portage.git reapply repoman typo fix svn path=/main/tags/2.2_pre1/; revision=9317 --- diff --git a/bin/repoman b/bin/repoman index 921861612..60e9c7239 100755 --- a/bin/repoman +++ b/bin/repoman @@ -649,7 +649,7 @@ else: xmllint_capable=True if options.mode == 'commit' and isCvs: - utilties.detect_vcs_conflicts(options, vcs="cvs") + utilities.detect_vcs_conflicts(options, vcs="cvs") if options.mode == "manifest": pass @@ -1592,10 +1592,10 @@ else: try: editor = os.environ.get("EDITOR") if editor and utilities.editor_is_executable(editor): - commitmessage = utilties.get_commit_message_with_editor( + commitmessage = utilities.get_commit_message_with_editor( editor, message=qa_output) else: - commitmessage = utilties.get_commit_message_with_stdin() + commitmessage = utilities.get_commit_message_with_stdin() except KeyboardInterrupt: exithandler() if not commitmessage or not commitmessage.strip(): diff --git a/mkrelease.sh b/mkrelease.sh index 098c80d1b..321e0ced6 100755 --- a/mkrelease.sh +++ b/mkrelease.sh @@ -12,7 +12,8 @@ die() { exit 1 } -while [ "${1:1}" == "-" ]; then +while [ "${1:0:1}" == "-" ]; do + echo $1 case "$1" in -t|--tag) CREATE_TAG=true @@ -27,7 +28,7 @@ while [ "${1:1}" == "-" ]; then die "unknown option: $1" ;; esac -fi +done [ -z "$1" ] && die "Need version argument" [ -n "${1/[0-9]*}" ] && die "Invalid version argument"