summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/pacman/sync.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 2c16382f..9cf781a9 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -43,7 +43,9 @@
extern pmdb_t *db_local;
-static int sync_cleandb(const char *dbpath) {
+/* if keep_used != 0, then the dirnames which match an used syncdb
+ * will be kept */
+static int sync_cleandb(const char *dbpath, int keep_used) {
DIR *dir;
struct dirent *ent;
@@ -68,12 +70,13 @@ static int sync_cleandb(const char *dbpath) {
if(!strcmp(dname, "sync") || !strcmp(dname, "local")) {
continue;
}
- syncdbs = alpm_option_get_syncdbs();
- for(i = syncdbs; i && !found; i = alpm_list_next(i)) {
- pmdb_t *db = alpm_list_getdata(i);
- found = !strcmp(dname, alpm_db_get_name(db));
+ if(keep_used) {
+ syncdbs = alpm_option_get_syncdbs();
+ for(i = syncdbs; i && !found; i = alpm_list_next(i)) {
+ pmdb_t *db = alpm_list_getdata(i);
+ found = !strcmp(dname, alpm_db_get_name(db));
+ }
}
-
/* We have a directory that doesn't match any syncdb.
* Ask the user if he wants to remove it. */
if(!found) {
@@ -102,12 +105,13 @@ static int sync_cleandb_all(void) {
if(!yesno(_("Do you want to remove unused repositories? [Y/n] "))) {
return(0);
}
- /* The sync dbs were previously put in dbpath, but are now in dbpath/sync,
- * so we will clean both directories */
- sync_cleandb(dbpath);
+ /* The sync dbs were previously put in dbpath/, but are now in dbpath/sync/,
+ * so we will clean everything in dbpath/ (except dbpath/local/ and dbpath/sync/,
+ * and only the unused sync dbs in dbpath/sync/ */
+ sync_cleandb(dbpath, 0);
sprintf(newdbpath, "%s%s", dbpath, "sync/");
- sync_cleandb(newdbpath);
+ sync_cleandb(newdbpath, 1);
printf(_("Database directory cleaned up\n"));
return(0);