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

fixed outputs when downloadonly flag is set (patch from VMiklos <vmiklos@frugalware.org>)

Browse source
This commit is contained in:
Aurelien Foret 2006-02-22 20:39:24 +00:00
parent 3f9ddf262d
commit 78ffd98701
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/pacman/trans.c
View file

@ -32,9 +32,13 @@
#include "util.h" #include "util.h"
#include "log.h" #include "log.h"
#include "trans.h" #include "trans.h"
#include "list.h"
#include "conf.h"
#define LOG_STR_LEN 256 #define LOG_STR_LEN 256
extern config_t *config;
/* Callback to handle transaction events /* Callback to handle transaction events
*/ */
void cb_trans_evt(unsigned char event, void *data1, void *data2) void cb_trans_evt(unsigned char event, void *data1, void *data2)
@ -120,16 +124,24 @@ void cb_trans_conv(unsigned char event, void *data1, void *data2, void *data3, i
*response = yesno(str); *response = yesno(str);
break; break;
case PM_TRANS_CONV_LOCAL_NEWER: case PM_TRANS_CONV_LOCAL_NEWER:
snprintf(str, LOG_STR_LEN, ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] ", if(!config->op_s_downloadonly) {
snprintf(str, LOG_STR_LEN, ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] ",
(char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME),
(char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION)); (char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION));
*response = yesno(str); *response = yesno(str);
} else {
*response = 1;
}
break; break;
case PM_TRANS_CONV_LOCAL_UPTODATE: case PM_TRANS_CONV_LOCAL_UPTODATE:
snprintf(str, LOG_STR_LEN, ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] ", if(!config->op_s_downloadonly) {
snprintf(str, LOG_STR_LEN, ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] ",
(char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME),
(char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION)); (char *)alpm_pkg_getinfo(data1, PM_PKG_VERSION));
*response = yesno(str); *response = yesno(str);
} else {
*response = 1;
}
break; break;
} }
} }