From 87d3436dbd6fe5f3aeb7880d1596aa7a5c6e7905 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 1 Dec 2008 19:03:03 -0600 Subject: Cleanup missing db file logic Do not touch missing db files. Additionally, no need to call db-remove if the db file doesn't exist Signed-off-by: Aaron Griffin --- db-move | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'db-move') diff --git a/db-move b/db-move index 0e0587c..7fab215 100755 --- a/db-move +++ b/db-move @@ -84,19 +84,14 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then # copy the db file into our working area if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then /bin/cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" . - else - touch "$repofrom.db.tar.$DB_COMPRESSION" + /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove" + #use '*' to move the old DB too + mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from + echo " Package files will be cleaned up automatically" fi - /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove" - #use '*' to move the old DB too - mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from - echo " Package files will be cleaned up automatically" - if [ -f "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" ]; then /bin/cp "$ftppath_to/$repoto.db.tar.$DB_COMPRESSION" . - else - touch "$repoto.db.tar.$DB_COMPRESSION" fi /bin/cp "$ftppath_from/$_pkgfile" . -- cgit v1.2.3-2-g168b 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-move | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'db-move') diff --git a/db-move b/db-move index 7fab215..ff9677b 100755 --- a/db-move +++ b/db-move @@ -84,7 +84,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then # copy the db file into our working area if [ -f "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" ]; then /bin/cp "$ftppath_from/$repofrom.db.tar.$DB_COMPRESSION" . - /usr/bin/repo-remove "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove" + /usr/bin/repo-remove -q "$repofrom.db.tar.$DB_COMPRESSION" $packagename || die "Error in repo-remove" #use '*' to move the old DB too mv $repofrom.db.tar.$DB_COMPRESSION* $ftppath_from echo " Package files will be cleaned up automatically" @@ -95,7 +95,7 @@ if [ -d "$packagename/repos/$svnrepo_from" ]; then fi /bin/cp "$ftppath_from/$_pkgfile" . - /usr/bin/repo-add "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add" + /usr/bin/repo-add -q "$repoto.db.tar.$DB_COMPRESSION" $_pkgfile || die "Error in repo-add" #use '*' to move the old DB too mv $repoto.db.tar.$DB_COMPRESSION* $_pkgfile $ftppath_to else -- cgit v1.2.3-2-g168b