From 1f48eaf35eecd0b35208d29d6fe6c0a8af7796df Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 1 Dec 2008 19:02:09 -0600 Subject: Do not touch db file if it doesn't exist repo-add works fine if no db file exists Signed-off-by: Aaron Griffin --- db-update | 2 -- 1 file changed, 2 deletions(-) (limited to 'db-update') diff --git a/db-update b/db-update index 1d2efa2..0c2d1fe 100755 --- a/db-update +++ b/db-update @@ -74,8 +74,6 @@ cd "$WORKDIR" # copy the db file into our working area if [ -f "$ftppath/$reponame.db.tar.$DB_COMPRESSION" ]; then /bin/cp "$ftppath/$reponame.db.tar.$DB_COMPRESSION" build/ -else - touch "build/$reponame.db.tar.$DB_COMPRESSION" fi echo "Updating DB for $reponame $_arch" -- cgit v1.2.3-24-g4f1b From 123e7560e49e04f9fdd552f9dc47bcedea2ea128 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 12 Dec 2008 00:14:39 -0600 Subject: Quiet down repo-add just a bit This assumes the -q flag patch is accepted for pacman 8) Signed-off-by: Aaron Griffin --- db-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'db-update') diff --git a/db-update b/db-update index 0c2d1fe..40c5539 100755 --- a/db-update +++ b/db-update @@ -142,7 +142,7 @@ if [ -n "$ADDPKGS" ]; then pkgs="" for pkg in $to_add; do pkgs="$pkgs $(basename $pkg)"; done - /usr/bin/repo-add "$reponame.db.tar.$DB_COMPRESSION" $pkgs + /usr/bin/repo-add -q "$reponame.db.tar.$DB_COMPRESSION" $pkgs else rm -f "build/$reponame.db.tar.$DB_COMPRESSION" echo "Errors found when adding packages" -- cgit v1.2.3-24-g4f1b From b0e7b12ed43b6614b6c32f1678edf53f1c668513 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 16 Dec 2008 08:50:53 -0800 Subject: Only remove packages that were successfully added This prevents some errors where packages where removed from the staging dir when they shouldn't have been. Original-idea-by: Pierre Schmitz Signed-off-by: Aaron Griffin --- db-update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'db-update') diff --git a/db-update b/db-update index 40c5539..2a9dd6e 100755 --- a/db-update +++ b/db-update @@ -164,9 +164,9 @@ else echo "Nothing to copy, no work done" fi -if [ -n "$ADDPKGS" ]; then +if [ -n "$to_add" ]; then echo "Cleaning staging dir" - /bin/rm $ADDPKGS + /bin/rm $to_add fi cleanup -- cgit v1.2.3-24-g4f1b From 830f8f87e1ede09a8c827c1a93aa4ed5db66f0b6 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 29 Dec 2008 13:31:33 -0800 Subject: Remove an if check for old staging 'add' dirs Signed-off-by: Aaron Griffin --- db-update | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'db-update') diff --git a/db-update b/db-update index 2a9dd6e..254a6f9 100755 --- a/db-update +++ b/db-update @@ -95,9 +95,7 @@ if [ -d "${stagedir}/add" ]; then echo "Please delete staging//{add,del}" echo " and ensure you are using the newest devtools" echo "--------------------------------------------------" - if [ -e "${stagedir}/add/"* ]; then - /bin/mv "${stagedir}/add/"* "$stagedir/" - fi + /bin/mv "${stagedir}/add/"* "$stagedir/" fi to_add="" -- cgit v1.2.3-24-g4f1b