summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2009-08-08 11:23:38 -0500
committerDan McGee <dan@archlinux.org>2009-08-08 11:23:38 -0500
commit7bb9c4098b29d7bcc82ff9e9a823d2adc44cc881 (patch)
tree29ecf1b7b8762426bfcf8c1e2b36d8181c0d1605 /scripts
parente8806748ec6efdf62fd1210873dc2fd38cccdf2a (diff)
parent6d00025c18e837f57a4f78ee232fe3d8f244f143 (diff)
downloadpacman-7bb9c4098b29d7bcc82ff9e9a823d2adc44cc881.tar.xz
Merge branch 'maint'
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in10
-rw-r--r--scripts/repo-add.sh.in2
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 05df175f..daa95856 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -953,6 +953,9 @@ create_package() {
exit 1 # $E_MISSING_PKGDIR
fi
+ cd "$pkgdir"
+ msg "$(gettext "Creating package...")"
+
if [ -z "$1" ]; then
nameofpkg="$pkgname"
else
@@ -961,9 +964,6 @@ create_package() {
write_pkginfo $nameofpkg
- cd "$pkgdir"
- msg "$(gettext "Creating package...")"
-
local comp_files=".PKGINFO"
# check for an install script
@@ -1444,8 +1444,8 @@ fi
ARGLIST=$@
# Parse Command Line Options.
-OPT_SHORT="AbcCdefFghiLmop:rRsV"
-OPT_LONG="allsource,asroot,ignorearch,builddeps,clean,cleancache,nodeps"
+OPT_SHORT="AcCdefFghiLmop:rRsV"
+OPT_LONG="allsource,asroot,ignorearch,clean,cleancache,nodeps"
OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver"
OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source"
OPT_LONG="$OPT_LONG,syncdeps,version,config:"
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index d3566f5a..a1e5f7f4 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -301,7 +301,7 @@ check_repo_db()
CLEAN_LOCK=1
else
error "$(gettext "Failed to acquire lockfile: %s.")" "$LOCKFILE"
- [ -f "$LOCKFILE" ] && error "$(gettext "Held by %s")" "$(cat $LOCKFILE)"
+ [ -f "$LOCKFILE" ] && error "$(gettext "Held by process %s")" "$(cat $LOCKFILE)"
exit 1
fi