Do not pull old archived packages before push

push.sh

@@ -140,7 +140,8 @@ push_repo() {
     elif [[ ${push_repo} -ne 1 ]]; then
         return
     fi
-    run_cmd "rsync -vrtlh --delete-before ${repo_basepath}/${repo_basename} ${repo_basepath}/archive_${repo_basename} ${remote_login}:${repo_remote_basepath}/ ${dry}"
+    run_cmd "rsync -vrtlh --delete-before ${repo_basepath}/${repo_basename} ${remote_login}:${repo_remote_basepath}/ ${dry}"
+    run_cmd "rsync -vrtlh ${repo_basepath}/archive_${repo_basename} ${remote_login}:${repo_remote_basepath}/ ${dry}"
     run_cmd_check 1 "Could not push packages to remote repo!"
 }
 
@@ -150,7 +151,8 @@ push_testing_repo() {
     elif [[ ${push_testing_repo} -ne 1 ]]; then
         return
     fi
-    run_cmd "rsync -vrtlh --delete-before ${repo_basepath}/${repo_basename}-testing ${repo_basepath}/archive_${repo_basename}-testing ${remote_login}:${repo_remote_basepath}/ ${dry}"
+    run_cmd "rsync -vrtlh --delete-before ${repo_basepath}/${repo_basename}-testing ${remote_login}:${repo_remote_basepath}/ ${dry}"
+    run_cmd "rsync -vrtlh ${repo_basepath}/${repo_basename}-testing ${repo_basepath}/archive_${repo_basename}-testing ${remote_login}:${repo_remote_basepath}/ ${dry}"
     run_cmd_check 1 "Could not push packages to remote testing repo!"
 }
 

repo.sh

@@ -129,7 +129,8 @@ pull_repo() {
     if [[ ${dry_run} -eq 1 ]]; then
         dry="-n"
     fi
-    run_cmd "rsync -vrtlh --delete-before ${remote_login}:${repo_remote_basepath}/${repo_name} ${remote_login}:${repo_remote_basepath}/archive_${repo_basename} ${repo_basepath}/ ${dry}"
+    run_cmd "mkdir -p ${repo_basepath}/archive_${repo_basename}"
+    run_cmd "rsync -vrtlh --delete-before ${remote_login}:${repo_remote_basepath}/${repo_name} ${repo_basepath}/ ${dry}"
     run_cmd_check 1 "Could not pull packages from remote repo!"
 }
 
@@ -138,7 +139,8 @@ pull_testing_repo() {
     if [[ ${dry_run} -eq 1 ]]; then
         dry="-n"
     fi
-    run_cmd "rsync -vrtlh --delete-before ${remote_login}:${repo_remote_basepath}/${repo_basename}-testing ${remote_login}:${repo_remote_basepath}/archive_${repo_basename}-testing ${repo_basepath}/ ${dry}"
+    run_cmd "mkdir -p ${repo_basepath}/archive_${repo_basename}-testing"
+    run_cmd "rsync -vrtlh --delete-before ${remote_login}:${repo_remote_basepath}/${repo_basename}-testing ${repo_basepath}/ ${dry}"
     run_cmd_check 1 "Could not pull packages from remote testing repo!"
 }