summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-03-18 21:46:03 -0500
committerDan McGee <dan@archlinux.org>2010-03-18 21:46:03 -0500
commitad4efa539de1e8e9e51baee82efeafde9fb24380 (patch)
treea35f2ca76918b3dc7971ff5807d02cecd15e3488
parentf6c7de77edee89650e8dabf728f296d48cd4b3e0 (diff)
downloadpacman-ad4efa539de1e8e9e51baee82efeafde9fb24380.tar.xz
Strip extension off all package compression types
Since we were searching for '.pkg.tar.gz' before, we now have started to show extensions during the download when we have a '.pkg.tar.xz' package. Just look for '.pkg.tar.' (or '.db.tar.') instead and suppress anything found from that point on. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--src/pacman/callback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index f572dc87..f5bf17d1 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -570,7 +570,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
fname = strdup(filename);
/* strip package or DB extension for cleaner look */
- if((p = strstr(fname, PKGEXT)) || (p = strstr(fname, DBEXT))) {
+ if((p = strstr(fname, ".pkg.tar.")) || (p = strstr(fname, ".db.tar."))) {
*p = '\0';
}
/* In order to deal with characters from all locales, we have to worry