summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2011-09-04 11:17:01 +0000
committerJason Woodward2011-09-04 11:17:01 +0000
commit32466e980c199784105ca27e70d582f2ff7f0307 (patch)
tree341e218cceb28fe25602a8d9eaa8c09530aded92
parenta32ef405a2781288a552c0f4bb4068facba82785 (diff)
downloadslapt-get-32466e980c199784105ca27e70d582f2ff7f0307.tar.gz
[libslapt] tighten up the package name regexen
Thanks to George Vlahavas for reporting slapt-src was incorrectly detecting slack packages post build, along with a regex change to fix it.
-rw-r--r--src/package.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/package.h b/src/package.h
index 5bd6a71..924cdbf 100644
--- a/src/package.h
+++ b/src/package.h
@@ -1,8 +1,8 @@
-#define SLAPT_PKG_PARSE_REGEX "(.*{1,})\\-(.*[\\-].*[\\-].*)\\.[tgblzikx]+[ ]{0,}$"
+#define SLAPT_PKG_PARSE_REGEX "(.*{1,})\\-(.*[\\-].*[\\-].*)\\.[ti]+[gblxkz]+[ ]{0,}$"
#define SLAPT_PKG_NAMEVER "(.*{1,})\\-(.*[\\-].*[\\-].*)"
#define SLAPT_PKG_VER "(.*)[\\-](.*)[\\-](.*)"
-#define SLAPT_PKG_NAME_PATTERN "^PACKAGE NAME:[ ]{1,}(.*{1,})\\-(.*[\\-].*[\\-].*)(\\.[tgblzikx]+)[ ]{0,}$"
+#define SLAPT_PKG_NAME_PATTERN "^PACKAGE NAME:[ ]{1,}(.*{1,})\\-(.*[\\-].*[\\-].*)(\\.[ti]+[gblzkx]+)[ ]{0,}$"
#define SLAPT_PKG_MIRROR_PATTERN "^PACKAGE MIRROR:[ ]+(.*)$"
#define SLAPT_PKG_PRIORITY_PATTERN "^PACKAGE PRIORITY:[ ]+([0-9]{1,})$"
#define SLAPT_PKG_LOCATION_PATTERN "^PACKAGE LOCATION:[ ]+(.*)$"
@@ -14,7 +14,7 @@
#define SLAPT_ROOT_ENV_NAME "ROOT"
#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,})\\-(.*[\\-].*[\\-].*)\\.[tgblzikx]+$"
+#define SLAPT_MD5SUM_REGEX "([a-zA-Z0-9]{1,})[ ]{1,}([a-zA-Z0-9\\/._+\\-]{1,})\\/(.*{1,})\\-(.*[\\-].*[\\-].*)\\.[ti]+[gblzkx]+$"
#define SLAPT_REQUIRED_REGEX "^[ ]{0,}([^ ]{1,})[ ]{0,}([\\<\\=\\>]+){0,}[ ]{0,}([a-zA-Z0-9\\+\\.\\_\\-]+){0,}[ ]{0,}$"
#define SLAPT_MD5_STR_LEN 33
#define SLAPT_PKG_LIST "PACKAGES.TXT"