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

Simplify sync_cleandb

Browse source 
1) Remove checks for removing pre-tardb files
2) Remove the long redundant keep_used parameter
3) Fix pacman error due to removing .sig file along with database

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2015-06-17 22:17:55 +10:00
parent 94204d1089
commit 2d7a41539b
1 changed files with 12 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/pacman/sync.c
View file

@ -51,9 +51,7 @@ static int unlink_verbose(const char *pathname, int ignore_missing)
return ret; return ret;
} }
/* if keep_used != 0, then the db files which match an used syncdb static int sync_cleandb(const char *dbpath)
* will be kept */
static int sync_cleandb(const char *dbpath, int keep_used)
{ {
DIR *dir; DIR *dir;
struct dirent *ent; struct dirent *ent;
@ -77,18 +75,11 @@ static int sync_cleandb(const char *dbpath, int keep_used)
const char *dname = ent->d_name; const char *dname = ent->d_name;
char *dbname; char *dbname;
size_t len; size_t len;
alpm_list_t *i;
if(strcmp(dname, ".") == 0 || strcmp(dname, "..") == 0) { if(strcmp(dname, ".") == 0 || strcmp(dname, "..") == 0) {
continue; continue;
} }
/* skip the local and sync directories */
if(strcmp(dname, "sync") == 0 || strcmp(dname, "local") == 0) {
continue;
}
/* skip the db.lck file */
if(strcmp(dname, "db.lck") == 0) {
continue;
}
/* build the full path */ /* build the full path */
snprintf(path, PATH_MAX, "%s%s", dbpath, dname); snprintf(path, PATH_MAX, "%s%s", dbpath, dname);
@ -116,24 +107,16 @@ static int sync_cleandb(const char *dbpath, int keep_used)
continue; continue;
} }
if(keep_used) { for(i = syncdbs; i && !found; i = alpm_list_next(i)) {
alpm_list_t *i; alpm_db_t *db = i->data;
for(i = syncdbs; i && !found; i = alpm_list_next(i)) { found = !strcmp(dbname, alpm_db_get_name(db));
alpm_db_t *db = i->data;
found = !strcmp(dbname, alpm_db_get_name(db));
}
} }
/* We have a database that doesn't match any syncdb. */ /* We have a file that doesn't match any syncdb. */
if(!found) { if(!found) {
/* ENOENT check is because the signature and database could come in any ret += unlink_verbose(path, 0);
* order in our readdir() call, so either file may already be gone. */
snprintf(path, PATH_MAX, "%s%s.db", dbpath, dbname);
ret += unlink_verbose(path, 1);
/* unlink a signature file if present too */
snprintf(path, PATH_MAX, "%s%s.db.sig", dbpath, dbname);
ret += unlink_verbose(path, 1);
} }
free(dbname); free(dbname);
} }
closedir(dir); closedir(dir);
@ -143,7 +126,7 @@ static int sync_cleandb(const char *dbpath, int keep_used)
static int sync_cleandb_all(void) static int sync_cleandb_all(void)
{ {
const char *dbpath; const char *dbpath;
char *newdbpath; char *syncdbpath;
int ret = 0; int ret = 0;
dbpath = alpm_option_get_dbpath(config->handle); dbpath = alpm_option_get_dbpath(config->handle);
@ -152,17 +135,13 @@ static int sync_cleandb_all(void)
return 0; return 0;
} }
printf(_("removing unused sync repositories...\n")); printf(_("removing unused sync repositories...\n"));
/* The sync dbs were previously put in dbpath/ but are now in dbpath/sync/.
* We will clean everything in dbpath/ except local/, sync/ and db.lck, and
* only the unused sync dbs in dbpath/sync/ */
ret += sync_cleandb(dbpath, 0);
if(asprintf(&newdbpath, "%s%s", dbpath, "sync/") < 0) { if(asprintf(&syncdbpath, "%s%s", dbpath, "sync/") < 0) {
ret += 1; ret += 1;
return ret; return ret;
} }
ret += sync_cleandb(newdbpath, 1); ret += sync_cleandb(syncdbpath);
free(newdbpath); free(syncdbpath);
return ret; return ret;
} }