moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

Allow cleaning only some cachedirs

Browse Source 
When cleaning the cache, ask for each cachedir separately.

Allan: add some white space in output

Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Jan Alexander Steffens (heftig) 2012-06-16 01:12:22 +02:00 committed by Dan McGee
parent 7193ce1ecd
commit 49dbebcc36
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/pacman/sync.c
View File

@ -172,10 +172,6 @@ static int sync_cleancache(int level)
alpm_list_t *cachedirs = alpm_option_get_cachedirs(config->handle); alpm_list_t *cachedirs = alpm_option_get_cachedirs(config->handle);
int ret = 0; int ret = 0;
for(i = cachedirs; i; i = alpm_list_next(i)) {
printf(_("Cache directory: %s\n"), (const char *)i->data);
}
if(!config->cleanmethod) { if(!config->cleanmethod) {
/* default to KeepInstalled if user did not specify */ /* default to KeepInstalled if user did not specify */
config->cleanmethod = PM_CLEAN_KEEPINST; config->cleanmethod = PM_CLEAN_KEEPINST;
@ -189,22 +185,31 @@ static int sync_cleancache(int level)
if(config->cleanmethod & PM_CLEAN_KEEPCUR) { if(config->cleanmethod & PM_CLEAN_KEEPCUR) {
printf(_(" All current sync database packages\n")); printf(_(" All current sync database packages\n"));
} }
if(!yesno(_("Do you want to remove all other packages from cache?"))) {
return 0;
}
printf(_("removing old packages from cache...\n"));
} else {
if(!noyes(_("Do you want to remove ALL files from cache?"))) {
return 0;
}
printf(_("removing all files from cache...\n"));
} }
printf("\n");
for(i = cachedirs; i; i = alpm_list_next(i)) { for(i = cachedirs; i; i = alpm_list_next(i)) {
const char *cachedir = i->data; const char *cachedir = i->data;
DIR *dir = opendir(cachedir); DIR *dir;
struct dirent *ent; struct dirent *ent;
printf(_("Cache directory: %s\n"), (const char *)i->data);
if(level == 1) {
if(!yesno(_("Do you want to remove all other packages from cache?"))) {
printf("\n");
continue;
}
printf(_("removing old packages from cache...\n"));
} else {
if(!noyes(_("Do you want to remove ALL files from cache?"))) {
printf("\n");
continue;
}
printf(_("removing all files from cache...\n"));
}
dir = opendir(cachedir);
if(dir == NULL) { if(dir == NULL) {
pm_printf(ALPM_LOG_ERROR, pm_printf(ALPM_LOG_ERROR,
_("could not access cache directory %s\n"), cachedir); _("could not access cache directory %s\n"), cachedir);
@ -310,6 +315,7 @@ static int sync_cleancache(int level)
} }
} }
closedir(dir); closedir(dir);
printf("\n");
} }
return ret; return ret;
@ -930,7 +936,6 @@ int pacman_sync(alpm_list_t *targets)
} }
ret += sync_cleancache(config->op_s_clean); ret += sync_cleancache(config->op_s_clean);
printf("\n");
ret += sync_cleandb_all(); ret += sync_cleandb_all();
if(trans_release() == -1) { if(trans_release() == -1) {