rm testing2x

5 files changed, 2 insertions, 80 deletions

diff --git a/README.md b/README.md
index 258226d..4072a6a 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The executables that you (might) care about are:
     ├── db-repo-add
     ├── db-repo-remove
     ├── db-update
-    └── testing2x
+    └── testing2x                       [Arch Linux only]
 
 Ok, now let's talk about what those are.
 
@@ -27,11 +27,6 @@ There are 3 "main" programs:
  - `db-remove` : remove packages from repositories
  - `db-move`   : move packages from one repository to another
 
-Moving packages from testing to stable repositories is such a common
-task that we have a wrapper around `db-move` to make it easier:
-
- - `testing2x`
-
 Of course, sometimes things go wrong, and you need to drop to a
 lower-level, but you don't want to go all the way down to pacman's
 `repo-add`/`repo-remove`.  So, we have:
diff --git a/config b/config
index 6defa92..8e03883 100644
--- a/config
+++ b/config
@@ -4,8 +4,6 @@ FTP_BASE="/srv/ftp"
 PKGREPOS=()
 PKGPOOL=''
 SRCPOOL=''
-TESTING_REPO=''
-STABLE_REPOS=()
 
 # VCS backend
 VCS=none
diff --git a/test/cases/common.bats b/test/cases/common.bats
index 4b798f8..8b4c3a0 100644
--- a/test/cases/common.bats
+++ b/test/cases/common.bats
@@ -1,7 +1,7 @@
 load ../lib/common
 
 @test "commands display usage message by default" {
-	for cmd in db-move db-remove db-repo-add db-repo-remove testing2x; do
+	for cmd in db-move db-remove db-repo-add db-repo-remove; do
 		echo Testing $cmd
 		run $cmd
 		(( $status == 1 ))
diff --git a/test/cases/testing2x.bats b/test/cases/testing2x.bats
deleted file mode 100644
index 6127cf9..0000000
--- a/test/cases/testing2x.bats
+++ /dev/null
@@ -1,16 +0,0 @@
-load ../lib/common
-
-@test "move any package" {
-	releasePackage core pkg-any-a
-	db-update
-
-	updatePackage pkg-any-a
-
-	releasePackage testing pkg-any-a
-	db-update
-
-	testing2x pkg-any-a
-
-	checkPackage core pkg-any-a 1-2
-	checkRemovedPackage testing pkg-any-a
-}
diff --git a/testing2x b/testing2x
deleted file mode 100755
index 99280b5..0000000
--- a/testing2x
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-. "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-functions"
-
-if (( $# < 1 )); then
-	msg "usage: %s <pkgname|pkgbase> ..." "${0##*/}"
-	exit 1
-fi
-
-# Lock everything to reduce  possibility of interfering task between the different repo-updates
-script_lock
-for repo in "${TESTING_REPO}" "${STABLE_REPOS[@]}"; do
-	for pkgarch in "${ARCHES[@]}"; do
-		repo_lock "${repo}" "${pkgarch}" || exit 1
-	done
-done
-
-declare -A pkgs
-
-for pkgbase in "$@"; do
-	found_source=false
-	for tarch in "${ARCHES[@]}"; do
-		if [[ -n $(arch_expac_pkgbase "$TESTING_REPO" "$tarch" '%n' "$pkgbase") ]]; then
-			found_source=true
-			break
-		fi
-	done
-	[[ $found_source = true ]] || die "%s not found in [%s]" "$pkgbase" "$TESTING_REPO"
-	found_target=false
-	for tarch in "${ARCHES[@]}"; do
-		for repo in "${STABLE_REPOS[@]}"; do
-			if [[ -n $(arch_expac_pkgbase "$repo" "$tarch" '%n' "$pkgbase") ]]; then
-				found_target=true
-				pkgs[${repo}]+="${pkgbase} "
-				break 2
-			fi
-		done
-	done
-	[[ $found_target = true ]] || die "%s not found in any of these repos: %s" "$pkgbase" "${STABLE_REPOS[*]}"
-done
-
-for pkgarch in "${ARCHES[@]}"; do
-	repo_unlock "${TESTING_REPO}" "${pkgarch}"
-done
-for repo in "${STABLE_REPOS[@]}"; do
-	for pkgarch in "${ARCHES[@]}"; do
-		repo_unlock "${repo}" "${pkgarch}"
-	done
-	if [[ -n ${pkgs[${repo}]} ]]; then
-		"$(dirname "$(readlink -e "$0")")/db-move" "${TESTING_REPO}" "${repo}" ${pkgs[${repo}]}
-	fi
-done
-
-script_unlock