- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Query documentation updates
by Nagy Gabor 19 May '09

19 May '09

>From 8f675582f8f0098ec524fa702c38058c687e53fd Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 14 May 2009 16:15:20 +0200 Subject: [PATCH] Query documentation updates The old documentation didn't emphasize our filtering options at all, and it was a bit misleading. ("List ALL...") I also clarified the description of -Qu. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 28 +++++++++++++++++----------- src/pacman/pacman.c | 10 +++++----- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 37680be..4582be5 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -33,7 +33,10 @@ Operations packages and their files, as well as meta-information about individual packages (dependencies, conflicts, install date, build date, size). This can be run against the local package database or can be used on - individual '.tar.gz' packages. See <<QO,Query Options>> below. + individual '.tar.gz' packages. In the first case, if no package names + are provided in the command line, all installed packages will be + queried. Additionally, various filters can be applied on the package + list. See <<QO,Query Options>> below. *-R, \--remove*:: Remove a package from the system. Groups can also be specified to be @@ -164,16 +167,17 @@ Query Options[[QO]] it will be shown if available. *-d, \--deps*:: - List all packages installed as dependencies. This option can be combined - with '-t' for listing real orphans- packages that were installed as - dependencies but are no longer required by any installed package. ('-Qdt' - is equivalent to the pacman 3.0.X '-Qe' option.) + Restrict or filter output to packages installed as dependencies. This + option can be combined with '-t' for listing real orphans- packages that + were installed as dependencies but are no longer required by any + installed package. ('-Qdt' is equivalent to the pacman 3.0.X '-Qe' + option.) *-e, \--explicit*:: - List all packages explicitly installed. This option can be combined with - '-t' to list top-level packages- those packages that were explicitly - installed but are not required by any other package. ('-Qet' is equivalent - to the pacman 2.9.X '-Qe' option.) + Restrict or filter output to packages explicitly installed. This option + can be combined with '-t' to list top-level packages- those packages + that were explicitly installed but are not required by any other + package. ('-Qet' is equivalent to the pacman 2.9.X '-Qe' option.) *-g, \--groups*:: Display all packages that are members of a named group. If a name is not @@ -221,8 +225,10 @@ Query Options[[QO]] installed package. *-u, \--upgrades*:: - Lists all packages that are out of date on the local system. This option - works best if the sync database is refreshed using '-Sy'. + Restrict or filter output to packages that are out of date on the local + system. (Only package versions are used to find outdated packages, + replacements are not checked here.) This option works best if the sync + database is refreshed using '-Sy'. Remove Options[[RO]] diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 14cfdfa..72a72ba 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -103,17 +103,17 @@ static void usage(int op, const char * const myname) printf("%s: %s {-Q --query} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); printf(_(" -c, --changelog view the changelog of a package\n")); - printf(_(" -d, --deps list all packages installed as dependencies\n")); - printf(_(" -e, --explicit list all packages explicitly installed\n")); + printf(_(" -d, --deps list packages installed as dependencies [filter]\n")); + printf(_(" -e, --explicit list packages explicitly installed [filter]\n")); printf(_(" -g, --groups view all members of a package group\n")); printf(_(" -i, --info view package information (-ii for backup files)\n")); printf(_(" -l, --list list the contents of the queried package\n")); - printf(_(" -m, --foreign list installed packages not found in sync db(s)\n")); + printf(_(" -m, --foreign list installed packages not found in sync db(s) [filter]\n")); printf(_(" -o, --owns <file> query the package that owns <file>\n")); printf(_(" -p, --file <package> query a package file instead of the database\n")); printf(_(" -s, --search <regex> search locally-installed packages for matching strings\n")); - printf(_(" -t, --unrequired list all packages not required by any package\n")); - printf(_(" -u, --upgrades list all outdated packages\n")); + printf(_(" -t, --unrequired list packages not required by any package [filter]\n")); + printf(_(" -u, --upgrades list outdated packages [filter]\n")); printf(_(" -q, --quiet show less information for query and search\n")); } else if(op == PM_OP_SYNC) { printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); -- 1.6.0.3

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-160-g212ea8a
by dan＠archlinux.org 19 May '09

19 May '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 (commit) via a812ad4ea4faeb5cb229a574adef47764840f890 (commit) via 1bbb34365c437ebdf85874f39474bce37c4b7144 (commit) via 1d8d932fa65d920ab4d43d90f3227c17714f4f14 (commit) via 783e710839d6de059b95e8ed117bdcee1233720f (commit) via c5d9b999c76dceb077d5d5332b440a12698e8519 (commit) via 4a582fac2a24b6fca170721ec7adcca9239457ff (commit) via 86cd72573b03297044112e50a88bd651190aa284 (commit) via 80caeabce0f28125f3b68388996ce39e58f2e5e8 (commit) via 250e66e57b6a187b5643ea6db088552e4efef488 (commit) via 5e32928a42366fd3df27ffe108b44fcfe35617dd (commit) via de44a0f474f4e78359b890644645bd7e153983d2 (commit) from 20017354f7ccb58bf4f78691985a5d237f4dbc90 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue May 12 11:01:58 2009 +0200 repo-add: fix -n tests which are applicable only to strings Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a812ad4ea4faeb5cb229a574adef47764840f890 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue May 12 11:09:11 2009 +0200 libarchive development has moved to Google Code Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1bbb34365c437ebdf85874f39474bce37c4b7144 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 23:00:16 2009 -0500 Add pyc files to autoclean Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d8d932fa65d920ab4d43d90f3227c17714f4f14 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 22:59:54 2009 -0500 Remove recursive remove in autoclean.sh Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 783e710839d6de059b95e8ed117bdcee1233720f Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 12:54:49 2009 -0300 Add more files to cleanup in autoclean.sh Add files pactest/tests/Makefile.in , pactest/tests/Makefile and contrib/Makefile.in , contrib/Makefile to list of cleanup script. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5d9b999c76dceb077d5d5332b440a12698e8519 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 13:04:11 2009 -0300 Add repo-remove.8 to list of cleanup in doc/Makefile.am repo-remove.8 is generated with Makefile but is not removed on clean. This patch add it to list of untracked autoconf files. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4a582fac2a24b6fca170721ec7adcca9239457ff Merge: 86cd72573b03297044112e50a88bd651190aa284 80caeabce0f28125f3b68388996ce39e58f2e5e8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 22:51:25 2009 -0500 Merge commit 'allan/working' commit 86cd72573b03297044112e50a88bd651190aa284 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Mon May 18 01:56:06 2009 -0300 Add an initial pactest/test/.gitignore Add an initial pactest/test/.gitignore to exclude sync200.py that is generated from sync200.py.in Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 80caeabce0f28125f3b68388996ce39e58f2e5e8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 16 14:39:18 2009 +1000 NEWS file updates for makepkg and contrib Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 250e66e57b6a187b5643ea6db088552e4efef488 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 16 13:48:10 2009 +1000 makepkg: fix sourcing BUILDSCRIPT and PATH issues The bash source command looks in the users PATH for the file to source before the local directory. This causes issues when someone has a PKGBUILD somewhere in their path (for unknown some reason...). Fixes FS#14727. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5e32928a42366fd3df27ffe108b44fcfe35617dd Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 11 01:16:51 2009 +1000 makepkg: Document package splitting Signed-off-by: Allan McRae <allan(a)archlinux.org> commit de44a0f474f4e78359b890644645bd7e153983d2 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 26 19:52:29 2009 +1000 makepkg: do not update pkgver when building source package When making a source package for a SCM PKGBUILD, makepkg should not update the pkgver/pkgrel. Noted in FS#14456. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: INSTALL | 2 +- NEWS | 20 ++++++++++++++++ autoclean.sh | 57 ++++++++++++++++++++++++--------------------- doc/Makefile.am | 2 +- doc/PKGBUILD.5.txt | 27 +++++++++++++++++----- doc/makepkg.8.txt | 6 ++-- pactest/tests/.gitignore | 1 + scripts/makepkg.sh.in | 18 +++++++------- scripts/repo-add.sh.in | 4 +- 9 files changed, 88 insertions(+), 49 deletions(-) create mode 100644 pactest/tests/.gitignore hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 2/3] repo-add: fix -n tests which are applicable only to strings
by Cedric Staniewski 19 May '09

19 May '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/repo-add.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 13097df..eb8837c 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -245,8 +245,8 @@ db_write_entry() echo -e "%VERSION%\n$pkgver\n" >>desc [ -n "$pkgdesc" ] && echo -e "%DESC%\n$pkgdesc\n" >>desc write_list_entry "GROUPS" "$_groups" "desc" - [ -n $csize ] && echo -e "%CSIZE%\n$csize\n" >>desc - [ -n $size ] && echo -e "%ISIZE%\n$size\n" >>desc + [ -n "$csize" ] && echo -e "%CSIZE%\n$csize\n" >>desc + [ -n "$size" ] && echo -e "%ISIZE%\n$size\n" >>desc # compute checksums msg2 "$(gettext "Computing md5 checksums...")" -- 1.6.3

2 1

[pacman-dev] [PATCH] libarchive development has moved to Google Code
by Cedric Staniewski 19 May '09

19 May '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- INSTALL | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index 3127cd3..f9989d5 100644 --- a/INSTALL +++ b/INSTALL @@ -14,7 +14,7 @@ You will need to build and install two libraries before you can properly build pacman. libarchive -http://people.freebsd.org/~kientzle/libarchive/ +http://code.google.com/p/libarchive/ libfetch ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/net/libfetch/README.html -- 1.6.3

2 1

[pacman-dev] [PATCH] Add repo-remove.8 to list of cleanup in doc/Makefile.am
by Gerardo Exequiel Pozzi 19 May '09

19 May '09

repo-remove.8 is generated with Makefile but is not removed on clean. This patch add it to list of untracked autoconf files. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- doc/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index a796a91..4703b63 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -51,7 +51,7 @@ EXTRA_DIST = \ $(DOXYGEN_MANS) # Files that should be removed, but which Automake does not know. -MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) +MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) repo-remove.8 # Ensure manpages are fresh when building a dist tarball dist-hook: -- 1.6.3

2 1

[pacman-dev] [PATCH] makepkg: fix sourcing BUILDSCRIPT and PATH issues
by Allan McRae 19 May '09

19 May '09

The bash source command looks in the users PATH for the file to source before the local directory. This causes issues when someone has a PKGBUILD somewhere in their path (for unknown some reason...). Fixes FS#14727. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fefcc73..f94f925 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1527,6 +1527,7 @@ if [ ! -f "$BUILDSCRIPT" ]; then else # PKGBUILD passed through a pipe BUILDSCRIPT=/dev/stdin + source "$BUILDSCRIPT" fi else crlftest=$(file $BUILDSCRIPT | grep -F 'CRLF' || true) @@ -1534,9 +1535,9 @@ else error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDSCRIPT" exit 1 fi -fi -source "$BUILDSCRIPT" + source ./"$BUILDSCRIPT" +fi if [ "$GENINTEG" -eq 1 ]; then mkdir -p "$srcdir" -- 1.6.3.1

2 1

[pacman-dev] [PATCH 1/2] Introduce PM_TRANS_FLAG_NOLOCK
by Nagy Gabor 19 May '09

19 May '09

From afa07db77af2896b407b24c6ef69bb19f6b80417 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 16 May 2009 16:54:21 +0200 Subject: [PATCH 1/2] Introduce PM_TRANS_FLAG_NOLOCK This flag indicates that the front-end will not call alpm_trans_commit(), so the database needn't be locked. This is the first step toward fixing FS#8905. If this flag is set, alpm_trans_commit() does nothing and returns with an error (that has new code: PM_ERR_TRANS_NOT_LOCKED). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/error.c | 2 ++ lib/libalpm/trans.c | 32 ++++++++++++++++++++------------ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2a6c2e0..1e22a59 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -276,7 +276,8 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_NEEDED = 0x2000, PM_TRANS_FLAG_ALLEXPLICIT = 0x4000, PM_TRANS_FLAG_UNNEEDED = 0x8000, - PM_TRANS_FLAG_RECURSEALL = 0x10000 + PM_TRANS_FLAG_RECURSEALL = 0x10000, + PM_TRANS_FLAG_NOLOCK = 0x20000 } pmtransflag_t; /** @@ -487,6 +488,7 @@ enum _pmerrno_t { PM_ERR_TRANS_NOT_PREPARED, PM_ERR_TRANS_ABORT, PM_ERR_TRANS_TYPE, + PM_ERR_TRANS_NOT_LOCKED, /* Packages */ PM_ERR_PKG_NOT_FOUND, PM_ERR_PKG_IGNORED, diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 47f0750..fdff9ed 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -99,6 +99,8 @@ const char SYMEXPORT *alpm_strerror(int err) return _("transaction aborted"); case PM_ERR_TRANS_TYPE: return _("operation not compatible with the transaction type"); + case PM_ERR_TRANS_NOT_LOCKED: + return _("transaction commit attempt when database is not locked"); /* Packages */ case PM_ERR_PKG_NOT_FOUND: return _("could not find or read package"); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index b144b2a..6e74f3f 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -71,9 +71,11 @@ int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1)); /* lock db */ - handle->lckfd = _alpm_lckmk(); - if(handle->lckfd == -1) { - RET_ERR(PM_ERR_HANDLE_LOCK, -1); + if(!(flags & PM_TRANS_FLAG_NOLOCK)) { + handle->lckfd = _alpm_lckmk(); + if(handle->lckfd == -1) { + RET_ERR(PM_ERR_HANDLE_LOCK, -1); + } } handle->trans = _alpm_trans_new(); @@ -158,6 +160,8 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data) ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(handle->trans->state == STATE_PREPARED, RET_ERR(PM_ERR_TRANS_NOT_PREPARED, -1)); + ASSERT(!(handle->trans->flags & PM_TRANS_FLAG_NOLOCK), RET_ERR(PM_ERR_TRANS_NOT_LOCKED, -1)); + return(_alpm_trans_commit(handle->trans, data)); } @@ -199,19 +203,23 @@ int SYMEXPORT alpm_trans_release() ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans->state != STATE_IDLE, RET_ERR(PM_ERR_TRANS_NULL, -1)); + int nolock_flag = trans->flags & PM_TRANS_FLAG_NOLOCK; + _alpm_trans_free(trans); handle->trans = NULL; /* unlock db */ - if(handle->lckfd != -1) { - while(close(handle->lckfd) == -1 && errno == EINTR); - handle->lckfd = -1; - } - if(_alpm_lckrm()) { - _alpm_log(PM_LOG_WARNING, _("could not remove lock file %s\n"), - alpm_option_get_lockfile()); - alpm_logaction("warning: could not remove lock file %s\n", - alpm_option_get_lockfile()); + if(!nolock_flag) { + if(handle->lckfd != -1) { + while(close(handle->lckfd) == -1 && errno == EINTR); + handle->lckfd = -1; + } + if(_alpm_lckrm()) { + _alpm_log(PM_LOG_WARNING, _("could not remove lock file %s\n"), + alpm_option_get_lockfile()); + alpm_logaction("warning: could not remove lock file %s\n", + alpm_option_get_lockfile()); + } } return(0); -- 1.6.3.1

2 1

[pacman-dev] Patch for srcpac to work with current makepkg
by u no hu 19 May '09

19 May '09

From: unohu <unohu0(a)gmail.com> Date: Fri, 15 May 2009 18:33:55 +0530 Subject: [PATCH] 2 bugfixes Replaced outdated makepkg option b with s copy all files instead of just PKGBUILD --- srcpac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpac b/srcpac index 3445c58..45f1b5d 100755 --- a/srcpac +++ b/srcpac @@ -129,13 +129,13 @@ build_packages() fi mkdir -p ${builddir} - cp ${pkgdir}/PKGBUILD ${builddir} + cp ${pkgdir}/* ${builddir} # apply configuration apply_config ${pkg} ${builddir} # seperate out our makepkg flags - MAKEPKGOPTS="-c -b -r -f" + MAKEPKGOPTS="-c -s -r -f" cd ${builddir} -- 1.6.2.3

3 3

[pacman-dev] [PATCH] Add an initial pactest/test/.gitignore
by Gerardo Exequiel Pozzi 19 May '09

19 May '09

Add an initial pactest/test/.gitignore to exclude sync200.py that is generated from sync200.py.in Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- pactest/tests/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/.gitignore diff --git a/pactest/tests/.gitignore b/pactest/tests/.gitignore new file mode 100644 index 0000000..665d9ce --- /dev/null +++ b/pactest/tests/.gitignore @@ -0,0 +1 @@ +sync200.py -- 1.6.3.1

2 1

[pacman-dev] [PATCH 2/2] We don't need root with -Sp
by Nagy Gabor 16 May '09

16 May '09

From 4531be12ace34a952e5d84e70f464f4643957793 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 16 May 2009 17:59:45 +0200 Subject: [PATCH 2/2] 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 <ngaba(a)bibl.u-szeged.hu> --- src/pacman/pacman.c | 3 ++- src/pacman/util.c | 19 ++++++++----------- src/pacman/util.h | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index b94b28e..3b8636c 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); } diff --git a/src/pacman/util.c b/src/pacman/util.c index a280252..8056fbd 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -69,19 +69,16 @@ int trans_release(void) return(0); } -int needs_transaction(void) +int needs_root(void) { - if(config->op != PM_OP_MAIN && config->op != PM_OP_QUERY && config->op != PM_OP_DEPTEST) { - if((config->op == PM_OP_SYNC && !config->op_s_sync && - (config->op_s_search || config->group || config->op_q_list || config->op_q_info)) - || config->op == PM_OP_DEPTEST) { - /* special case: PM_OP_SYNC can be used w/ config->op_s_search by any user */ - return(0); - } else { - return(1); - } + if(config->op == PM_OP_UPGRADE || config->op == PM_OP_REMOVE || /* -U, -R */ + (config->op == PM_OP_SYNC && (config->op_s_clean || config->op_s_sync || /* -Sc, -Sy */ + (!config->group && !config->op_s_info && !config->op_q_list /* all other -S combinations, where */ + && !config->op_s_search && !config->op_s_printuris)))) { /* -g, -i, -l, -s, -p is not set */ + return(1); + } else { + return(0); } - return(0); } /* gets the current screen column width */ diff --git a/src/pacman/util.h b/src/pacman/util.h index 6416858..b159018 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -38,7 +38,7 @@ int trans_init(pmtranstype_t type, pmtransflag_t flags); int trans_release(void); -int needs_transaction(void); +int needs_root(void); int getcols(void); int makepath(const char *path); int rmrf(const char *path); -- 1.6.3.1

1 0