aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Woodward2009-04-28 21:24:12 +0000
committerJason Woodward2009-04-28 21:24:12 +0000
commitd7b4dcd1a46989019499bf335e56d0b90ae8634b (patch)
tree22332df09e80c968b75c211b1df379fdc3b6e7a2 /src
parent64269bef2093906ef9175f002cee766030c225c7 (diff)
downloadslapt-get-d7b4dcd1a46989019499bf335e56d0b90ae8634b.tar.gz
added support for the txz package extension
Diffstat (limited to 'src')
-rw-r--r--src/package.c1
-rw-r--r--src/package.h6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/package.c b/src/package.c
index b916f3b..044a0b3 100644
--- a/src/package.c
+++ b/src/package.c
@@ -978,6 +978,7 @@ void slapt_get_md5sums(struct slapt_pkg_list *pkgs, FILE *checksum_file)
if (
(strstr(getline_buffer,".tgz") == NULL) &&
(strstr(getline_buffer,".tlz") == NULL) &&
+ (strstr(getline_buffer,".txz") == NULL) &&
(strstr(getline_buffer,".ikg") == NULL) &&
(strstr(getline_buffer,".tbz") == NULL)
)
diff --git a/src/package.h b/src/package.h
index f66d416..cb5e805 100644
--- a/src/package.h
+++ b/src/package.h
@@ -1,8 +1,8 @@
-#define SLAPT_PKG_PARSE_REGEX "(.*{1,})\\-(.*[\\-].*[\\-].*)\\.[tgblzik]+[ ]{0,}$"
+#define SLAPT_PKG_PARSE_REGEX "(.*{1,})\\-(.*[\\-].*[\\-].*)\\.[tgblzikx]+[ ]{0,}$"
#define SLAPT_PKG_NAMEVER "(.*{1,})\\-(.*[\\-].*[\\-].*)"
#define SLAPT_PKG_VER "(.*)[\\-](.*)[\\-](.*)"
-#define SLAPT_PKG_NAME_PATTERN "^PACKAGE NAME:[ ]{1,}(.*{1,})\\-(.*[\\-].*[\\-].*)(\\.[tgblzik]+)[ ]{0,}$"
+#define SLAPT_PKG_NAME_PATTERN "^PACKAGE NAME:[ ]{1,}(.*{1,})\\-(.*[\\-].*[\\-].*)(\\.[tgblzikx]+)[ ]{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,})\\-(.*[\\-].*[\\-].*)\\.[tgblzik]+$"
+#define SLAPT_MD5SUM_REGEX "([a-zA-Z0-9]{1,})[ ]{1,}([a-zA-Z0-9\\/._\\-]{1,})\\/(.*{1,})\\-(.*[\\-].*[\\-].*)\\.[tgblzikx]+$"
#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"