moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-11 05:48:09 -05:00
Code Issues Releases Wiki Activity

Propagate return status up in DB cleaning code

Browse Source 
We didn't look at the return status of sync_cleandb() in sync_cleandb_all().
Make it do so and return it up the call chain.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2009-09-21 08:09:00 -05:00
parent e6efd1932b
commit ece8f6fb0b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pacman/sync.c
View File

@ -103,9 +103,11 @@ 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 = alpm_option_get_dbpath(); const char *dbpath;
char newdbpath[PATH_MAX]; char newdbpath[PATH_MAX];
int ret = 0;
dbpath = alpm_option_get_dbpath();
printf(_("Database directory: %s\n"), dbpath); printf(_("Database directory: %s\n"), dbpath);
if(!yesno(_("Do you want to remove unused repositories?"))) { if(!yesno(_("Do you want to remove unused repositories?"))) {
return(0); return(0);
@ -113,13 +115,13 @@ static int sync_cleandb_all(void) {
/* The sync dbs were previously put in dbpath/, but are now in dbpath/sync/, /* 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/, * so we will clean everything in dbpath/ (except dbpath/local/ and dbpath/sync/,
* and only the unused sync dbs in dbpath/sync/ */ * and only the unused sync dbs in dbpath/sync/ */
sync_cleandb(dbpath, 0); ret += sync_cleandb(dbpath, 0);
sprintf(newdbpath, "%s%s", dbpath, "sync/"); sprintf(newdbpath, "%s%s", dbpath, "sync/");
sync_cleandb(newdbpath, 1); ret += sync_cleandb(newdbpath, 1);
printf(_("Database directory cleaned up\n")); printf(_("Database directory cleaned up\n"));
return(0); return(ret);
} }
static int sync_cleancache(int level) static int sync_cleancache(int level)