summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2011-10-15 09:50:35 +0000
committerJason Woodward2011-10-15 09:50:35 +0000
commit32ca3261466473c698d133e62bb3944451739448 (patch)
treebc6280f91cd76752197d1438f9ddaf7803d4435f
parent5f74db20eed77e7c48c6b8437008588b2ce45e08 (diff)
downloadslapt-src-32ca3261466473c698d133e62bb3944451739448.tar.gz
drop extra version comparison in finding the generated package
The version information in .info reflects the upstream version, not the exact resulting version used in the slackware package. Libva version violates the slack convention with VERSION="0.31.1-1+sds4" in info and the slackbuild specifies VERSION=0.31.1_1+sds4.
-rw-r--r--ChangeLog3
-rw-r--r--src/source.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bf04d7..b464098 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
+0.3.2c Oct 15, 2011
+ * drop extra version comparison in finding the generated package
+
0.3.2b Oct 05, 2011
* --build name:version no longer auto installs
diff --git a/src/source.c b/src/source.c
index 2532996..ec41825 100644
--- a/src/source.c
+++ b/src/source.c
@@ -697,8 +697,12 @@ static char *_get_pkg_filename (const char *version, const char *pkgtag)
if (pkg_regex->reg_return != 0)
continue;
+ /* version from .info file may not match resulting
+ pkg version
+ libva: VERSION="0.31.1-1+sds4" and VERSION=0.31.1_1+sds4
if (strstr (file->d_name, version) == NULL)
continue;
+ */
if (pkgtag != NULL)
if (strstr (file->d_name, pkgtag) == NULL)