summaryrefslogtreecommitdiff
path: root/src/pacman
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-01-14 22:58:44 -0600
committerDan McGee <dan@archlinux.org>2008-01-14 22:58:44 -0600
commit38e981fab3f901e6c932e2f2913790ef0b96c6c2 (patch)
tree1dcf8610529b51626780b3666455f72858361828 /src/pacman
parent521de7ceedc6e4f5df52c0380f536a6f13a7f578 (diff)
parenta0ac72b42219fbcf17dd7cf2ee992b71a6a1375a (diff)
Merge branch 'maint'
Diffstat (limited to 'src/pacman')
-rw-r--r--src/pacman/pacman.c4
-rw-r--r--src/pacman/remove.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 1aa29682..27130254 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -606,8 +606,8 @@ static int _parseconfig(const char *file, const char *givensection,
* follow the toupper() rules we may expect, e.g. tr_TR where i != I.
*/
upperkey = strtoupper(strdup(key));
- if(section == NULL && (strcmp(key, "Include") == 0 || strcmp(upperkey, "INCLUDE") == 0)) {
- pm_printf(PM_LOG_ERROR, _("config file %s, line %d: 'Include' directive must belong to a section.\n"),
+ if(section == NULL) {
+ pm_printf(PM_LOG_ERROR, _("config file %s, line %d: All directives must belong to a section.\n"),
file, linenum);
return(1);
}
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index fde5c737..56837fa2 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -155,8 +155,7 @@ int pacman_remove(alpm_list_t *targets)
list_display(_("Targets:"), lst);
FREELIST(lst);
/* get confirmation */
- if(!config->noconfirm
- && yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) {
+ if(yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) {
remove_cleanup();
FREELIST(finaltargs);
return(1);