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

code cleanup

Browse source
This commit is contained in:
Aurelien Foret 2006-01-07 17:50:20 +00:00
parent 74b3e0dcae
commit 59edbdd4cf
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/pacman/sync.c
View file

@ -526,7 +526,7 @@ int pacman_sync(list_t *targets)
MSG(NL, ":: %s: requires %s", alpm_dep_getinfo(miss, PM_DEP_TARGET), MSG(NL, ":: %s: requires %s", alpm_dep_getinfo(miss, PM_DEP_TARGET),
alpm_dep_getinfo(miss, PM_DEP_NAME)); alpm_dep_getinfo(miss, PM_DEP_NAME));
switch((int)alpm_dep_getinfo(miss, PM_DEP_MOD)) { switch((int)alpm_dep_getinfo(miss, PM_DEP_MOD)) {
case PM_DEP_MOD_EQ: MSG(CL, "=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break; case PM_DEP_MOD_EQ: MSG(CL, "=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break;
case PM_DEP_MOD_GE: MSG(CL, ">=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break; case PM_DEP_MOD_GE: MSG(CL, ">=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break;
case PM_DEP_MOD_LE: MSG(CL, "<=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break; case PM_DEP_MOD_LE: MSG(CL, "<=%s", alpm_dep_getinfo(miss, PM_DEP_VERSION)); break;
} }
@ -606,7 +606,7 @@ int pacman_sync(list_t *targets)
MSG(NL, "\nTargets: "); MSG(NL, "\nTargets: ");
str = buildstring(list_install); str = buildstring(list_install);
indentprint(str, 9); indentprint(str, 9);
MSG(NL, "Total Package Size: %.1f MB\n", mb); MSG(NL, "\nTotal Package Size: %.1f MB\n", mb);
FREELIST(list_install); FREELIST(list_install);
FREE(str); FREE(str);
@ -633,7 +633,6 @@ int pacman_sync(list_t *targets)
} }
} }
if(!confirm) { if(!confirm) {
retval = 1;
goto cleanup; goto cleanup;
} }
} }

4
src/pacman/trans.c
View file

@ -100,7 +100,7 @@ void cb_trans_conv(unsigned char event, void *data1, void *data2, void *data3, i
switch(event) { switch(event) {
case PM_TRANS_CONV_INSTALL_IGNOREPKG: case PM_TRANS_CONV_INSTALL_IGNOREPKG:
snprintf(str, LOG_STR_LEN, ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] ", snprintf(str, LOG_STR_LEN, ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] ",
(char *)alpm_pkg_getinfo(data1, PM_PKG_NAME), (char *)alpm_pkg_getinfo(data1, PM_PKG_NAME),
(char *)alpm_pkg_getinfo(data2, PM_PKG_NAME)); (char *)alpm_pkg_getinfo(data2, PM_PKG_NAME));
*response = yesno(str); *response = yesno(str);
@ -113,7 +113,7 @@ 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_CONFLICT_PKG: case PM_TRANS_CONV_CONFLICT_PKG:
snprintf(str, LOG_STR_LEN, "\n:: %s conflicts with %s. Remove %s? [Y/n] ", snprintf(str, LOG_STR_LEN, ":: %s conflicts with %s. Remove %s? [Y/n] ",
(char *)data1, (char *)data1,
(char *)data2, (char *)data2,
(char *)data2); (char *)data2);