diff options
| author | Dan McGee <dan@archlinux.org> | 2008-01-21 19:42:08 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-21 19:42:08 -0600 |
| commit | cbcf542ad22c479f3e0be9698e13c52687953ec9 (patch) | |
| tree | 3c44f5cf4045a852bad363560e98a32b4f0816a3 /scripts | |
| parent | 2a7101c049dd1874da09d7d120f8855c61e55809 (diff) | |
| parent | bba62655fe06989e89576e66a97607da88aa9916 (diff) | |
| download | pacman-cbcf542ad22c479f3e0be9698e13c52687953ec9.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 219e2d17..998e240c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -464,6 +464,12 @@ download_sources() { continue fi + # if we get here, check to make sure it was a URL, else fail + if [ "$file" = "$netfile" ]; then + error "$(gettext "%s was not found in the build directory and is not a URL.")" "$netfile" + exit 1 # $E_MISSING_FILE + fi + # find the client we should use for this URL local dlclient=$(get_downloadclient $netfile) || exit $? @@ -1181,7 +1187,7 @@ done if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then # The extra '--' is here to prevent gettext from thinking --holdver is # an option - error "$(gettext -- "--holdver and --forcever cannot both be specified")" + error "$(gettext "\\0--holdver and --forcever cannot both be specified" )" exit 1 fi |