From f4ecc908eccc3ace2e40b15be837e4fa44ecf0a0 Mon Sep 17 00:00:00 2001 From: Nagy Gabor Date: Sat, 16 May 2009 17:59:45 +0200 Subject: We don't need root with -Sp FS#8905 is fixed. The front-end passes PM_TRANS_FLAG_NOLOCK to the back-end, so it doesn't lock the database. That's why we don't need root anymore. I reworked (and renamed) needs_transaction() accordingly. I also added missing -Sc check there (for example, -Sci didn't print non-root error, but pacman wanted to lock the database). Signed-off-by: Nagy Gabor Signed-off-by: Dan McGee --- src/pacman/pacman.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/pacman/pacman.c') diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index c542a989..3f5384ca 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -481,6 +481,7 @@ static int parseargs(int argc, char *argv[]) config->op_q_isfile = 1; config->op_s_printuris = 1; config->flags |= PM_TRANS_FLAG_NOCONFLICTS; + config->flags |= PM_TRANS_FLAG_NOLOCK; break; case 'q': config->quiet = 1; @@ -900,7 +901,7 @@ int main(int argc, char *argv[]) #if defined(HAVE_GETEUID) && !defined(CYGWIN) /* check if we have sufficient permission for the requested operation */ - if(myuid > 0 && needs_transaction()) { + if(myuid > 0 && needs_root()) { pm_printf(PM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n")); cleanup(EXIT_FAILURE); } -- cgit v1.2.3