Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/PKGBUILD.5.txt5
-rw-r--r--lib/libalpm/db.c2
-rw-r--r--lib/libalpm/deps.c4
-rw-r--r--pactest/tests/provision001.py2
-rw-r--r--pactest/tests/provision002.py4
-rw-r--r--pactest/tests/provision011.py2
-rw-r--r--pactest/tests/provision012.py2
-rw-r--r--pactest/tests/provision021.py2
-rw-r--r--pactest/tests/provision022.py2
9 files changed, 13 insertions, 12 deletions
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 3ef9d04e..ac394729 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -145,8 +145,9 @@ Options and Directives
a package to provide dependencies other than its own package name. For
example, the dcron package can provide 'cron', which allows packages to
depend on 'cron' rather than 'dcron OR fcron'.
- Versioned provisions are also possible. For example, dcron can provide
- 'cron 2.0' to satisfy the 'cron>=2.0' dependency of other packages.
+ Versioned provisions are also possible, in the 'name=version' format.
+ For example, dcron can provide 'cron=2.0' to satisfy the 'cron>=2.0'
+ dependency of other packages.
*replaces (array)*::
An array of packages that this package should replace, and can be used
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index d8e770b8..1485c34a 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -650,7 +650,7 @@ int _alpm_prov_cmp(const void *provision, const void *needle)
char *tmpptr;
char *provname = strdup(provision);
int retval = 0;
- tmpptr = strchr(provname, ' ');
+ tmpptr = strchr(provname, '=');
if(tmpptr != NULL) { /* provision-version */
*tmpptr='\0';
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index 8c302b69..ec52083e 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -336,10 +336,10 @@ int SYMEXPORT alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep)
satisfy = (strcmp(pkgname, dep->name) == 0
&& dep_vercmp(pkgversion, dep->mod, dep->version));
- /* check provisions, format : "name version" */
+ /* check provisions, format : "name=version" */
for(i = alpm_pkg_get_provides(pkg); i && !satisfy; i = i->next) {
char *provname = strdup(i->data);
- char *provver = strchr(provname, ' ');
+ char *provver = strchr(provname, '=');
if(provver == NULL) { /* no provision version */
satisfy = (dep->mod == PM_DEP_MOD_ANY
diff --git a/pactest/tests/provision001.py b/pactest/tests/provision001.py
index 36364c16..37e3d935 100644
--- a/pactest/tests/provision001.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/provision002.py b/pactest/tests/provision002.py
index fa5f3688..32bc4b8d 100644
--- a/pactest/tests/provision002.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/provision011.py b/pactest/tests/provision011.py
index 7fd5e6b4..96aac300 100644
--- a/pactest/tests/provision011.py
+++ b/pactest/tests/provision011.py
@@ -5,7 +5,7 @@ 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 = "-U %s" % p.filename()
diff --git a/pactest/tests/provision012.py b/pactest/tests/provision012.py
index 11cdad4e..f7ed2216 100644
--- a/pactest/tests/provision012.py
+++ b/pactest/tests/provision012.py
@@ -5,7 +5,7 @@ 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 = "-U %s" % p.filename()
diff --git a/pactest/tests/provision021.py b/pactest/tests/provision021.py
index 4b06a1a7..a98e1f33 100644
--- a/pactest/tests/provision021.py
+++ b/pactest/tests/provision021.py
@@ -5,7 +5,7 @@ p.depends = ["provision>=1.0-2"]
self.addpkg2db("sync", 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 = "-S %s" % p.name
diff --git a/pactest/tests/provision022.py b/pactest/tests/provision022.py
index d7f06913..4883d428 100644
--- a/pactest/tests/provision022.py
+++ b/pactest/tests/provision022.py
@@ -5,7 +5,7 @@ p.depends = ["provision>=1.0-2"]
self.addpkg2db("sync", 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 = "-S %s" % p.name