summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2007-12-09 05:07:32 +0000
committerJason Woodward2007-12-09 05:07:32 +0000
commitc68cf8c30fffec55ced24f42de4e59baf4cb5aeb (patch)
treefb3a5656a6012aef8b3730402be82b92071e33a3
parentc2480a71ac21af30fa92ea52e189e4b604b80774 (diff)
downloadslapt-get-c68cf8c30fffec55ced24f42de4e59baf4cb5aeb.tar.gz
Fix for parsing dependencies that have a dash in the package name
-rw-r--r--ChangeLog3
-rw-r--r--Makefile2
-rw-r--r--slack-desc2
-rw-r--r--src/package.h2
4 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 66c5629..6545af4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
+0.9.12d Dec 09, 2007
+ * Fix for parsing dependencies that have a dash in the package name
+
0.9.12c Oct 27, 2007
* updated russian translation from ru@li.org
* allow version, list, available, installed, show, and search options to be
diff --git a/Makefile b/Makefile
index b7ac513..e3e8772 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
PACKAGE=slapt-get
-VERSION=0.9.12c
+VERSION=0.9.12d
ARCH=$(shell uname -m | sed -e "s/i[3456]86/i386/")
LIBDIR=/usr/lib
RELEASE=1
diff --git a/slack-desc b/slack-desc
index 05aff5b..6af713e 100644
--- a/slack-desc
+++ b/slack-desc
@@ -9,7 +9,7 @@
slapt-get: slapt-get (APT like system for Slackware)
slapt-get: slapt-get is an APT like system for Slackware package management.
slapt-get:
-slapt-get: * See /usr/doc/slapt-get-0.9.12c/ for complete documentation.
+slapt-get: * See /usr/doc/slapt-get-0.9.12d/ for complete documentation.
slapt-get: * You will also want to customize /etc/slapt-get/slapt-getrc,
slapt-get: using a local mirror. www.slackware.com may be very busy.
slapt-get: * Support:
diff --git a/src/package.h b/src/package.h
index 659bf89..1b5ebf0 100644
--- a/src/package.h
+++ b/src/package.h
@@ -14,7 +14,7 @@
#define SLAPT_ROOT_ENV_LEN 255
#define SLAPT_PKG_LOG_PATTERN "^(.*{1,})\\-(.*[\\-].*[\\-].*)"
#define SLAPT_MD5SUM_REGEX "([a-zA-Z0-9]{1,})[ ]{1,}([a-zA-Z0-9\\/._\\-]{1,})\\/(.*{1,})\\-(.*[\\-].*[\\-].*).t[gbl]z$"
-#define SLAPT_REQUIRED_REGEX "^[ ]{0,}([a-zA-Z0-9\\+_\\-]+)[ ]{0,}([\\<\\=\\>]+){0,}[ ]{0,}([a-zA-Z0-9\\.\\_\\-]+){0,}[ ]{0,}$"
+#define SLAPT_REQUIRED_REGEX "^[ ]{0,}([^ ]{1,})[ ]{0,}([\\<\\=\\>]+){0,}[ ]{0,}([a-zA-Z0-9\\.\\_\\-]+){0,}[ ]{0,}$"
#define SLAPT_MD5_STR_LEN 34
#define SLAPT_PKG_LIST "PACKAGES.TXT"
#define SLAPT_PKG_LIST_GZ "PACKAGES.TXT.gz"