Revert "Add -S --recursive operation"

This reverts commit f3fa77bcf1d792971c314f8c0de255866e89f3f3 along with
making other necessary changes to fully back this (mis)feature out until
we can do it correctly.

The quick summary here is this was not implemented correctly; provides
are not fully taken into account in this logic, and making that happen
exposes a lot of other flaws in this code that are covered up later on
in the dependency resolving process by several other pieces of
convoluted and conditional logic.

Tests have been adjusted accordingly. Some test EXISTS conditions have
been removed as we already know the package is installed locally, and we
also are checking the VERSION condition anyway.

With these two related revert commits, we do have some changes in test
pass/fail results:

* upgrade078.py: does not pass, this is due to --recursive getting
  removed for -U/-S operations after this commit.
* sync302.py: the version checks have been disabled, so this test
  continues to pass but has been scaled back in scope.
* sync303.py: now passes, was failing before.
* sync304.py: still failing, was failing before.
* sync305.py: now passes, was failing before.
* sync306.py: still passes, was passing before.

Signed-off-by: Dan McGee <dan@archlinux.org>

3 files changed, 8 insertions, 12 deletions

diff --git a/test/pacman/tests/sync304.py b/test/pacman/tests/sync304.py
index 4ac1a015..18058c99 100644
--- a/test/pacman/tests/sync304.py
+++ b/test/pacman/tests/sync304.py
@@ -19,9 +19,7 @@ self.option["SyncFirst"] = ["pacman"]
 self.args = "-Su"
 
 self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_EXIST=pacman")
 self.addrule("PKG_VERSION=pacman|4.0.1-1")
-self.addrule("PKG_EXIST=pyalpm")
 self.addrule("PKG_VERSION=pyalpm|2-1")
 
 self.expectfailure = True
diff --git a/test/pacman/tests/sync306.py b/test/pacman/tests/sync306.py
index ca7a547e..c7401d07 100644
--- a/test/pacman/tests/sync306.py
+++ b/test/pacman/tests/sync306.py
@@ -59,5 +59,4 @@ self.addpkg2db("local", lp7)
 
 self.args = "-S pacman"
 self.addrule("PACMAN_RETCODE=0")
-self.addrule("PKG_EXIST=pacman")
 self.addrule("PKG_VERSION=pacman|4.0.1-2")
diff --git a/test/pacman/tests/upgrade078.py b/test/pacman/tests/upgrade078.py
index 718d5871..8ef32456 100644
--- a/test/pacman/tests/upgrade078.py
+++ b/test/pacman/tests/upgrade078.py
@@ -20,15 +20,15 @@ expat_lpkg = pmpkg("expat", "2.0.1-6")
 self.addpkg2db("local", expat_lpkg)
 
 # Sync db
-curl_sync = pmpkg("curl", "7.21.7-1")
-self.addpkg2db("sync", curl_sync)
+perl_sync = pmpkg("perl", "5.14.1-3")
+perl_sync.depends = ["glibc"]
+self.addpkg2db("sync", perl_sync)
 
 glibc_sync = pmpkg("glibc", "2.1.4-4")
 self.addpkg2db("sync", glibc_sync)
 
-perl_sync = pmpkg("perl", "5.14.1-3")
-perl_sync.depends = ["glibc"]
-self.addpkg2db("sync", perl_sync)
+curl_sync = pmpkg("curl", "7.21.7-1")
+self.addpkg2db("sync", curl_sync)
 
 expat_sync = pmpkg("expat", "2.0.1-6")
 self.addpkg2db("sync", expat_sync)
@@ -46,11 +46,10 @@ self.addrule("PKG_DEPENDS=git|perl")
 self.addrule("PKG_DEPENDS=perl|glibc")
 self.addrule("PKG_EXIST=git")
 self.addrule("PKG_VERSION=git|1.7.6-1")
-self.addrule("PKG_EXIST=curl")
 self.addrule("PKG_VERSION=curl|7.21.7-1")
-self.addrule("PKG_EXIST=glibc")
 self.addrule("PKG_VERSION=glibc|2.1.4-4")
-self.addrule("PKG_EXIST=perl")
 self.addrule("PKG_VERSION=perl|5.14.1-3")
-self.addrule("PKG_EXIST=expat")
 self.addrule("PKG_VERSION=expat|2.0.1-6")
+
+# --recursive operation was removed for now
+self.expectfailure = True