bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add pacman support for .files databases

Browse source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2015-06-17 22:27:50 +10:00
parent 289fdf0d1d
commit b0dac754d2
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pacman/callback.c
View file

@ -750,7 +750,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total)
fname = malloc(len + 1); fname = malloc(len + 1);
memcpy(fname, filename, len); memcpy(fname, filename, len);
/* strip package or DB extension for cleaner look */ /* strip package or DB extension for cleaner look */
if((p = strstr(fname, ".pkg")) || (p = strstr(fname, ".db"))) { if((p = strstr(fname, ".pkg")) || (p = strstr(fname, ".db")) || (p = strstr(fname, ".files"))) {
/* tack on a .sig suffix for signatures */ /* tack on a .sig suffix for signatures */
if(memcmp(&filename[len - 4], ".sig", 4) == 0) { if(memcmp(&filename[len - 4], ".sig", 4) == 0) {
memcpy(p, ".sig", 4); memcpy(p, ".sig", 4);

8
src/pacman/sync.c
View file

@ -102,6 +102,10 @@ static int sync_cleandb(const char *dbpath)
dbname = strndup(dname, len - 3); dbname = strndup(dname, len - 3);
} else if(len > 7 && strcmp(dname + len - 7, ".db.sig") == 0) { } else if(len > 7 && strcmp(dname + len - 7, ".db.sig") == 0) {
dbname = strndup(dname, len - 7); dbname = strndup(dname, len - 7);
} else if(len > 6 && strcmp(dname + len - 6, ".files") == 0) {
dbname = strndup(dname, len - 6);
} else if(len > 6 && strcmp(dname + len - 6, ".files.sig") == 0) {
dbname = strndup(dname, len - 10);
} else { } else {
ret += unlink_verbose(path, 0); ret += unlink_verbose(path, 0);
continue; continue;
@ -215,8 +219,8 @@ static int sync_cleancache(int level)
static const char *const glob_skips[] = { static const char *const glob_skips[] = {
/* skip signature files - they are removed with their package file */ /* skip signature files - they are removed with their package file */
"*.sig", "*.sig",
/* skip package database within the cache directory */ /* skip package databases within the cache directory */
"*.db*", "*.db*", "*.files*",
/* skip source packages within the cache directory */ /* skip source packages within the cache directory */
"*.src.tar.*", "*.src.tar.*",
/* skip package deltas, we aren't smart enough to clean these yet */ /* skip package deltas, we aren't smart enough to clean these yet */