Merge branch 'maint'

8 files changed, 53 insertions, 8 deletions

diff --git a/pactest/tests/sync500.py b/pactest/tests/provision001.py
index 36364c16..37e3d935 100644
--- a/pactest/tests/sync500.py
+++ b/pactest/tests/provision001.py
@@ -1,7 +1,7 @@
 self.description = "-S provision"
 
 sp = pmpkg("pkg1")
-sp.provides = ["provision 1.0-1"]
+sp.provides = ["provision=1.0-1"]
 self.addpkg2db("sync", sp)
 
 self.args = "-S provision"
diff --git a/pactest/tests/sync501.py b/pactest/tests/provision002.py
index fa5f3688..32bc4b8d 100644
--- a/pactest/tests/sync501.py
+++ b/pactest/tests/provision002.py
@@ -1,11 +1,11 @@
 self.description = "-S provision"
 
 sp = pmpkg("pkg1")
-sp.provides = ["provision 1.0-1"]
+sp.provides = ["provision=1.0-1"]
 self.addpkg2db("sync", sp)
 
 sp = pmpkg("pkg2")
-sp.provides = ["provision 1.0-1"]
+sp.provides = ["provision=1.0-1"]
 self.addpkg2db("sync", sp)
 
 self.args = "-S provision"
diff --git a/pactest/tests/add043.py b/pactest/tests/provision010.py
index 18f732ee..711a7319 100644
--- a/pactest/tests/add043.py
+++ b/pactest/tests/provision010.py
@@ -8,7 +8,7 @@ lp = pmpkg("pkg2", "1.0-2")
 lp.provides = ["provision"]
 self.addpkg2db("local", lp)
 
-self.args = "-A %s" % p.filename()
+self.args = "-U %s" % p.filename()
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")
diff --git a/pactest/tests/add044.py b/pactest/tests/provision011.py
index cbc82e9d..96aac300 100644
--- a/pactest/tests/add044.py
+++ b/pactest/tests/provision011.py
@@ -5,10 +5,10 @@ p.depends = ["provision>=1.0-2"]
 self.addpkg(p)
 
 lp = pmpkg("pkg2", "1.0-2")
-lp.provides = ["provision 1.0-2"]
+lp.provides = ["provision=1.0-2"]
 self.addpkg2db("local", lp)
 
-self.args = "-A %s" % p.filename()
+self.args = "-U %s" % p.filename()
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=pkg1")
diff --git a/pactest/tests/add045.py b/pactest/tests/provision012.py
index b53e0906..f7ed2216 100644
--- a/pactest/tests/add045.py
+++ b/pactest/tests/provision012.py
@@ -5,10 +5,10 @@ p.depends = ["provision>=1.0-2"]
 self.addpkg(p)
 
 lp = pmpkg("pkg2", "1.0-2")
-lp.provides = ["provision 1.0-1"]
+lp.provides = ["provision=1.0-1"]
 self.addpkg2db("local", lp)
 
-self.args = "-A %s" % p.filename()
+self.args = "-U %s" % p.filename()
 
 self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")
diff --git a/pactest/tests/provision020.py b/pactest/tests/provision020.py
new file mode 100644
index 00000000..7cb0a01b
--- /dev/null
+++ b/pactest/tests/provision020.py
@@ -0,0 +1,15 @@
+self.description = "provision>=1.0-2 dependency"
+
+p = pmpkg("pkg1", "1.0-2")
+p.depends = ["provision>=1.0-2"]
+self.addpkg2db("sync", p)
+
+lp = pmpkg("pkg2", "1.0-2")
+lp.provides = ["provision"]
+self.addpkg2db("local", lp)
+
+self.args = "-S %s" % p.name
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("!PKG_EXIST=pkg1")
+self.addrule("PKG_EXIST=pkg2")
diff --git a/pactest/tests/provision021.py b/pactest/tests/provision021.py
new file mode 100644
index 00000000..a98e1f33
--- /dev/null
+++ b/pactest/tests/provision021.py
@@ -0,0 +1,15 @@
+self.description = "provision>=1.0-2 dependency (2)"
+
+p = pmpkg("pkg1", "1.0-2")
+p.depends = ["provision>=1.0-2"]
+self.addpkg2db("sync", p)
+
+lp = pmpkg("pkg2", "1.0-2")
+lp.provides = ["provision=1.0-2"]
+self.addpkg2db("local", lp)
+
+self.args = "-S %s" % p.name
+
+self.addrule("PACMAN_RETCODE=0")
+self.addrule("PKG_EXIST=pkg1")
+self.addrule("PKG_EXIST=pkg2")
diff --git a/pactest/tests/provision022.py b/pactest/tests/provision022.py
new file mode 100644
index 00000000..4883d428
--- /dev/null
+++ b/pactest/tests/provision022.py
@@ -0,0 +1,15 @@
+self.description = "provision>=1.0-2 dependency (3)"
+
+p = pmpkg("pkg1", "1.0-2")
+p.depends = ["provision>=1.0-2"]
+self.addpkg2db("sync", p)
+
+lp = pmpkg("pkg2", "1.0-2")
+lp.provides = ["provision=1.0-1"]
+self.addpkg2db("local", lp)
+
+self.args = "-S %s" % p.name
+
+self.addrule("PACMAN_RETCODE=1")
+self.addrule("!PKG_EXIST=pkg1")
+self.addrule("PKG_EXIST=pkg2")