From f16c7a4343c2e82d7ead0423c70495de5441b1ef Mon Sep 17 00:00:00 2001 From: Xavier Chantry Date: Sun, 2 Aug 2009 23:00:04 +0200 Subject: repo-add: clarify one message Signed-off-by: Xavier Chantry Signed-off-by: Dan McGee --- scripts/repo-add.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') 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 -- cgit v1.2.3-54-g00ecf From 839bb562693d83aa61e996b492b731ff452a2bcd Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 8 Aug 2009 19:21:50 +1000 Subject: makepkg: change to pkgdir before creating PKGINFO file Commit 01f9ae63 moved that creation of the PKGINFO file to before changing to pkgdir. This causes issues when using the -R option (FS#15851). Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 56ad2c0b..cd41c4aa 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 -- cgit v1.2.3-54-g00ecf From ee43e75ed2e8b852f1ae140d8a619a39a90d8481 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 7 Aug 2009 16:22:55 +1000 Subject: Remove builddeps from option parser Leftover from commit ae5ef3b9 Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index cd41c4aa..c8384f80 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -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:" -- cgit v1.2.3-54-g00ecf