moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

Do not warn about missing database if being downloaded

Browse Source 
When a configured repo database is not already downloaded, a warning
message such as "warning: database file for 'testing' does not exist"
is printed.  Disable this warning when the database is scheduled to
be downloaded in the transaction.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-10-29 15:35:41 +10:00
parent 422a4021e4
commit f5d904d97f
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libalpm/alpm.h
View File

@ -351,7 +351,9 @@ typedef enum _alpm_event_t {
ALPM_EVENT_DISKSPACE_DONE,
/** An optdepend for another package is being removed
* The requiring package and its dependency are passed to the callback */
ALPM_EVENT_OPTDEP_REQUIRED
ALPM_EVENT_OPTDEP_REQUIRED,
/** A configured repository database is missing */
ALPM_EVENT_DATABASE_MISSING
} alpm_event_t;
/** Event callback */

3
lib/libalpm/be_sync.c
View File

@ -89,8 +89,7 @@ static int sync_db_validate(alpm_db_t *db)
if(_alpm_access(db->handle, NULL, dbpath, R_OK) != 0 && errno == ENOENT) {
db->status &= ~DB_STATUS_EXISTS;
db->status |= DB_STATUS_MISSING;
_alpm_log(db->handle, ALPM_LOG_WARNING,
"database file for '%s' does not exist\n", db->treename);
EVENT(db->handle, ALPM_EVENT_DATABASE_MISSING, db->treename, NULL);
goto valid;
}
db->status |= DB_STATUS_EXISTS;

6
src/pacman/callback.c
View File

@ -243,6 +243,12 @@ void cb_event(alpm_event_t event, void *data1, void *data2)
printf(_(":: %s optionally requires %s\n"), alpm_pkg_get_name(data1),
alpm_dep_compute_string(data2));
break;
case ALPM_EVENT_DATABASE_MISSING:
if(!config->op_s_sync) {
pm_printf(ALPM_LOG_WARNING,
"database file for '%s' does not exist\n", (char *)data1);
}
break;
/* all the simple done events, with fallthrough for each */
case ALPM_EVENT_FILECONFLICTS_DONE:
case ALPM_EVENT_CHECKDEPS_DONE: