diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2006-01-07 18:50:20 +0100 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2006-01-07 18:50:20 +0100 |
| commit | 59edbdd4cf12f6eba49946dca15e4cfd6d2c35c0 (patch) | |
| tree | e9c9c8f151069f6f38bd3b0d597af3a745500401 | |
| parent | 74b3e0dcaeec9a07636b9227f372b0c1cf153986 (diff) | |
| download | pacman-59edbdd4cf12f6eba49946dca15e4cfd6d2c35c0.tar.gz pacman-59edbdd4cf12f6eba49946dca15e4cfd6d2c35c0.tar.xz | |
code cleanup
| -rw-r--r-- | src/pacman/sync.c | 5 | ||||
| -rw-r--r-- | src/pacman/trans.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 0cdb8806..7a76dea0 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -526,7 +526,7 @@ int pacman_sync(list_t *targets) MSG(NL, ":: %s: requires %s", alpm_dep_getinfo(miss, PM_DEP_TARGET), alpm_dep_getinfo(miss, PM_DEP_NAME)); 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_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: "); str = buildstring(list_install); indentprint(str, 9); - MSG(NL, "Total Package Size: %.1f MB\n", mb); + MSG(NL, "\nTotal Package Size: %.1f MB\n", mb); FREELIST(list_install); FREE(str); @@ -633,7 +633,6 @@ int pacman_sync(list_t *targets) } } if(!confirm) { - retval = 1; goto cleanup; } } diff --git a/src/pacman/trans.c b/src/pacman/trans.c index f97c91fa..07ac3a3b 100644 --- a/src/pacman/trans.c +++ b/src/pacman/trans.c @@ -100,7 +100,7 @@ void cb_trans_conv(unsigned char event, void *data1, void *data2, void *data3, i switch(event) { 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(data2, PM_PKG_NAME)); *response = yesno(str); @@ -113,7 +113,7 @@ void cb_trans_conv(unsigned char event, void *data1, void *data2, void *data3, i *response = yesno(str); break; 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 *)data2, (char *)data2); |