- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.0-32-g0303b26
by dan＠archlinux.org 21 Mar '11

21 Mar '11

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 0303b26b1ed6d060e65ec7dbae5db50fc14836ff (commit) via 0cf05c77ad86b5c1895e94284b571afba5feebe8 (commit) from b2fde01c545286bb92f6194603817602bf9dfbe7 (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 0303b26b1ed6d060e65ec7dbae5db50fc14836ff Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 20 19:45:57 2011 -0500 Style change: return(x) --> return x This was discussed and more or less agreed upon on the mailing list. A huge checkin, but if we just do it and let people adjust the pain will end soon enough. Rebasing should be relatively straighforward for anyone that sees conflicts; just be sure you use the new return style if possible. The following semantic patch was used to do the change, along with some hand-massaging in order to preserve parenthesis where appropriate: The semantic match that finds this problem is as follows, although some hand-massaging was done in order to keep parenthesis where appropriate: (http://coccinelle.lip6.fr/) // <smpl> @@ expression a; @@ - return(a); + return a; // </smpl> A macros_file was also provided with the following content: Additional steps taken, mainly for ASSERT() macros: $ sed -i -e 's#return(NULL)#return NULL#' lib/libalpm/*.c $ sed -i -e 's#return(-1)#return -1#' lib/libalpm/*.c Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0cf05c77ad86b5c1895e94284b571afba5feebe8 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Feb 10 11:19:41 2011 -0500 lib/dload.c: fix opening braces to conform with coding style Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 8 ++-- lib/libalpm/add.c | 34 ++++++------ lib/libalpm/alpm.c | 10 ++-- lib/libalpm/alpm_list.c | 87 ++++++++++++++++---------------- lib/libalpm/backup.c | 14 +++--- lib/libalpm/be_local.c | 70 +++++++++++++------------- lib/libalpm/be_package.c | 26 +++++----- lib/libalpm/be_sync.c | 20 ++++---- lib/libalpm/conflict.c | 62 ++++++++++++------------ lib/libalpm/db.c | 120 ++++++++++++++++++++++---------------------- lib/libalpm/delta.c | 36 +++++++------- lib/libalpm/deps.c | 88 ++++++++++++++++---------------- lib/libalpm/diskspace.c | 22 ++++---- lib/libalpm/dload.c | 50 +++++++++++-------- lib/libalpm/error.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 6 +- lib/libalpm/handle.c | 44 ++++++++-------- lib/libalpm/log.c | 4 +- lib/libalpm/package.c | 32 ++++++------ lib/libalpm/pkghash.c | 34 ++++++------ lib/libalpm/remove.c | 16 +++--- lib/libalpm/sync.c | 28 +++++----- lib/libalpm/trans.c | 62 ++++++++++++------------ lib/libalpm/util.c | 88 ++++++++++++++++---------------- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 14 +++--- src/pacman/callback.c | 2 +- src/pacman/conf.c | 8 ++-- src/pacman/database.c | 10 ++-- src/pacman/deptest.c | 4 +- src/pacman/package.c | 4 +- src/pacman/pacman.c | 102 +++++++++++++++++++------------------- src/pacman/query.c | 60 +++++++++++----------- src/pacman/remove.c | 16 +++--- src/pacman/sync.c | 86 ++++++++++++++++---------------- src/pacman/upgrade.c | 22 ++++---- src/pacman/util.c | 122 +++++++++++++++++++++++----------------------- src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 18 +++--- src/util/testdb.c | 20 ++++---- src/util/testpkg.c | 6 +- src/util/vercmp.c | 6 +- 43 files changed, 738 insertions(+), 731 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.0-17-g78e55be
by dan＠archlinux.org 21 Mar '11

21 Mar '11

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, maint has been updated via 78e55be0e6e51fe34e51544070c69cb6634b7eff (commit) via 32e35d4028f30db5fc7cf96478015be293e4d123 (commit) via bdc1508a068af7d9fb3d401922c0f2d8b012d8dc (commit) from 67c0e9cab39a536f1ca2fbf2a35fe898e3b71ef4 (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 78e55be0e6e51fe34e51544070c69cb6634b7eff Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 20 20:11:11 2011 -0500 Remove unnecessary NULL check fp can never be NULL at this point in the code, proven by Coccinelle. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 32e35d4028f30db5fc7cf96478015be293e4d123 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 20 20:10:19 2011 -0500 Fix comparison to 0 rather than NULL Another fix found by Coccinelle example semantic patches. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bdc1508a068af7d9fb3d401922c0f2d8b012d8dc Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 20 19:56:55 2011 -0500 Fix assignment before NULL check Easy fix, found using null_ref.cocci example Coccinelle script. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 2 +- lib/libalpm/package.c | 2 +- src/pacman/pacman.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] SyncFirst and dependencies
by Lukas Fleischer 20 Mar '11

20 Mar '11

Hi, I'm not really sure if this actually is a bug or intended behaviour but upgrading pacman man my freshly installed system with [testing] enabled just broke pacman: $ pacman pacman: error while loading shared libraries: liblzma.so.5: cannot open shared object file: No such file or directory After some investigation, I figured out that "liblzma.so" is part of xz-utils which was renamed to "xz" sometime ago. When doing the first full system upgrade, pacman asked me to upgrade itself, first. As "SyncFirst" packages seem to be pulled in without dependency resolution, I ended up in having pacman 3.5.0, but an old xz-utils, resulting in some broken pacman depending on some shared library of a package that hasn't been upgraded yet. Is that intended? Unfortunately, I'm in a rush and I don't have any time to analyze this in detail right now...

4 14

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.0-30-gb2fde01
by dan＠archlinux.org 20 Mar '11

20 Mar '11

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 b2fde01c545286bb92f6194603817602bf9dfbe7 (commit) via 67c0e9cab39a536f1ca2fbf2a35fe898e3b71ef4 (commit) via 524b3389746f3ea44042050ba28b975b65e931ad (commit) via 352b799efceb9f2dae1832f1d321b0488c059060 (commit) via b0f9477f01a5639a2c9213f19a6ee8acefd00f1e (commit) via 58df372be6758cfe00069ac7279cd92e3b61edef (commit) via f6716ae94a5f299569b35bebb4d0aae23cd9af97 (commit) via b6cada3eed82a305dbc656baa7f046a73dcce25a (commit) via b48f71841712d1839f5e900f1ec0fdf5665354ba (commit) via ff713a51bd2244df047fa686055fd945eece0b7e (commit) via 0da6c591c0c4a4a8649f1549d095baa74a4191d9 (commit) via e47fc2d7c6eb99a7b09393c6938ea47416cb88bc (commit) from e6c9076a74f72d7c5164e2154ce1f47f8886e6e5 (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 b2fde01c545286bb92f6194603817602bf9dfbe7 Merge: 524b338 67c0e9c Author: Dan McGee <dan(a)archlinux.org> Date: Sun Mar 20 11:49:42 2011 -0500 Merge branch 'maint' commit 524b3389746f3ea44042050ba28b975b65e931ad Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 17 21:39:21 2011 -0400 INSTALL: replace libfetch with libcurl Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 352b799efceb9f2dae1832f1d321b0488c059060 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 17 11:09:31 2011 -0400 lib/dload.c: remove lingering libfetch specific headers Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ff713a51bd2244df047fa686055fd945eece0b7e Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 17 10:47:04 2011 -0400 remove antiquated contrib/wget-xdelta.sh Support for this script was removed in makepkg by commit b4e1365. Delta creation support has been provided by scripts/pkgdelta. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0da6c591c0c4a4a8649f1549d095baa74a4191d9 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Mar 17 09:01:30 2011 -0400 Fix triple progress bars on download Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: INSTALL | 4 +- contrib/Makefile.am | 5 +-- contrib/README | 3 -- contrib/wget-xdelta.sh.in | 70 ---------------------------------------- lib/libalpm/be_sync.c | 12 ++++++- lib/libalpm/diskspace.c | 15 +++++++- lib/libalpm/dload.c | 11 +++--- lib/libalpm/util.h | 1 + ltmain.sh | 14 ++++++++ scripts/makepkg.sh.in | 12 ++++-- src/pacman/sync.c | 7 ++++ test/pacman/tests/ignore006.py | 2 +- 12 files changed, 63 insertions(+), 93 deletions(-) delete mode 100755 contrib/wget-xdelta.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.0-14-g67c0e9c
by dan＠archlinux.org 20 Mar '11

20 Mar '11

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, maint has been updated via 67c0e9cab39a536f1ca2fbf2a35fe898e3b71ef4 (commit) via b0f9477f01a5639a2c9213f19a6ee8acefd00f1e (commit) via 58df372be6758cfe00069ac7279cd92e3b61edef (commit) via f6716ae94a5f299569b35bebb4d0aae23cd9af97 (commit) via b6cada3eed82a305dbc656baa7f046a73dcce25a (commit) via b48f71841712d1839f5e900f1ec0fdf5665354ba (commit) via e47fc2d7c6eb99a7b09393c6938ea47416cb88bc (commit) from 308aa38a40fb26d535f0b874bb64fe987126d03f (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_sync.c | 12 +++++++++++- lib/libalpm/diskspace.c | 15 +++++++++++++-- lib/libalpm/util.h | 1 + ltmain.sh | 14 ++++++++++++++ scripts/makepkg.sh.in | 12 ++++++++---- src/pacman/sync.c | 7 +++++++ test/pacman/tests/ignore006.py | 2 +- 7 files changed, 55 insertions(+), 8 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] change to option handling for --debug and -v
by Ray Kohler 20 Mar '11

20 Mar '11

I noticed a change in the way 3.5 processes some of its command-line flags: It used to be that --debug and -v were handled immediately, such that their initial output appeared before pacman complained of a usage error. Now, it errors out immediately. This may seem like an unimportant case, but it actually breaks pkgfile from pkgtools, which runs both "pacman -v" and "pacman --debug" without any further arguments (so it can parse the output). As I haven't seen any bug report, any update to pkgfile from Daenyth, or any other comment, I thought I'd ask if this was intentional, and whether it is pacman, or pkgfile, that ought to change. I found it actually easy to work around, by modifying pkgfile to use a -Q main operation in both of these cases. If I haven't made myself clear, try doing just "pacman -v" or "pacman --debug" on both 3.4.x and 3.5.0.

3 3

[pacman-dev] [PATCH] Fix handling of ignored packages
by Pang Yan Han 19 Mar '11

19 Mar '11

Noted in FS#23342. When the user attempts to install an ignored package and answers no when asked whether to install it, pacman bails out with: "error: target not found: packagename" This is because satisfiers are not found for the package and execution continues to process_group(), where the package is treated as a group (which does not exist). In addition, test ignore006.py is updated with PACMAN_RETCODE=0 since saying no to installing an ignored package should not be considered an error. Signed-off-by: Pang Yan Han <pangyanhan(a)gmail.com> --- src/pacman/sync.c | 7 +++++++ test/pacman/tests/ignore006.py | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 26f6f82..29bcf54 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -663,6 +663,13 @@ static int process_targname(alpm_list_t *dblist, char *targname) { pmpkg_t *pkg = alpm_find_dbs_satisfier(dblist, targname); + /* #FS23342 - skip ignored packages when user says no */ + if(pm_errno == PM_ERR_PKG_IGNORED) { + pm_printf(PM_LOG_WARNING, _("skipping target: %s\n"), targname); + pm_errno = 0; + return(0); + } + if(pkg) { return(process_pkg(pkg)); } diff --git a/test/pacman/tests/ignore006.py b/test/pacman/tests/ignore006.py index d80ff81..4c1c1ca 100644 --- a/test/pacman/tests/ignore006.py +++ b/test/pacman/tests/ignore006.py @@ -6,5 +6,5 @@ self.option["IgnorePkg"] = ["package1"] self.args = "--ask=1 -S %s" % pkg.name -self.addrule("PACMAN_RETCODE=1") +self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=package1") -- 1.7.4.1

2 1

[pacman-dev] [PATCH] makepkg: Improve optdepends extraction
by Allan McRae 19 Mar '11

19 Mar '11

Prevents issues where optdepends descriptions contain a bracket. Also, strip all comments from arrays before joining them. Fixes FS#23307. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 23081fe..bb7616c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1258,7 +1258,8 @@ check_sanity() { fi local provides_list=() - eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | sed "s/provides=/provides_list+=/") + eval $(awk '/^[[:space:]]*provides=/,/\)/' "$BUILDFILE" | \ + sed -e "s/provides=/provides_list+=/" -e "s/#.*//") for i in ${provides_list[@]}; do if [[ $i != ${i//</} || $i != ${i//>/} ]]; then error "$(gettext "Provides array cannot contain comparison (< or >) operators.")" @@ -1267,7 +1268,8 @@ check_sanity() { done local backup_list=() - eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | sed "s/backup=/backup_list+=/") + eval $(awk '/^[[:space:]]*backup=/,/\)/' "$BUILDFILE" | \ + sed -e "s/backup=/backup_list+=/" -e "s/#.*//") for i in "${backup_list[@]}"; do if [[ ${i:0:1} = "/" ]]; then error "$(gettext "Backup entry should not contain leading slash : %s")" "$i" @@ -1276,7 +1278,8 @@ check_sanity() { done local optdepends_list=() - eval $(awk '/^[[:space:]]*optdepends=/,/\)/' "$BUILDFILE" | sed "s/optdepends=/optdepends_list+=/") + eval $(awk '/^[[:space:]]*optdepends=$/,/$[[:space:]]*(|#.*)$/' "$BUILDFILE" | \ + sed -e "s/optdepends=/optdepends_list+=/" -e "s/#.*//") for i in "${optdepends_list[@]}"; do local pkg=${i%%:*} if [[ ! $pkg =~ ^[[:alnum:]\>\<\=\.\+\_\-]+$ ]]; then @@ -1300,7 +1303,8 @@ check_sanity() { local valid_options=1 local known kopt options_list - eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | sed "s/options=/options_list+=/") + eval $(awk '/^[[:space:]]*options=/,/\)/' "$BUILDFILE" | \ + sed -e "s/options=/options_list+=/" -e "s/#.*//") for i in ${options_list[@]}; do known=0 # check if option matches a known option or its inverse -- 1.7.4.1

2 2

Re: [pacman-dev] [arch-general] Pacman db files and permissions.
by Allan McRae 18 Mar '11

18 Mar '11

On 19/03/11 08:34, Peter Lewis wrote: > Hi, > > It seems to me that something has changed regarding the way pacman handles > permissions of its files since 3.5. > > I updated to pacman 3.5 yesterday, and today tried to do a pacman -Ss<foo> as > my normal user. I got some "error: could not open file" errors and it bailed. > > Now, I have my umask set as 077, but this didn't seem to affect the way pacman > worked before: > > % ls -l /var/lib/pacman/sync/core/pacman-3.4.3-1/desc > -rw-r--r-- 1 root root 370 Mar 17 19:53 /var/lib/pacman/sync/core/pacman-3.4.3-1/desc > > % ls -l /var/lib/pacman/sync/core.db > -rw------- 1 root root 38K Mar 18 05:25 /var/lib/pacman/sync/core.db > > Did pacman used to set the permissions on things it had downloaded, and this > hasn't been added to the .db file handling code? > > Or is this supposed to happen? > Please file a bug report. Before the sync databases were extracted so your umask did not matter. Now it apparently does... Allan

1 0

[pacman-dev] [PATCH] Ensure we have a root partition when checking space
by Dan McGee 17 Mar '11

17 Mar '11

Partially addresses the "why doesn't CheckSpace work in a chroot" issue. We can't make it work, but we can at least detect when it won't work by the lack of a root partition to bucket the stragglers into. Check the last item in the mountpoint list to ensure it is our root device, and if not, bail out with an error. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- For maint? Allan, Eric, enjoy, I think this should help address things, but testing it out in a chroot would be much appreciated. -Dan lib/libalpm/diskspace.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 892b1aa..19eaeea 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -61,7 +61,7 @@ static int mount_point_cmp(const void *p1, const void *p2) static alpm_list_t *mount_point_list(void) { - alpm_list_t *mount_points = NULL; + alpm_list_t *mount_points = NULL, *ptr; alpm_mountpoint_t *mp; #if defined HAVE_GETMNTENT @@ -124,6 +124,10 @@ static alpm_list_t *mount_point_list(void) mount_points = alpm_list_msort(mount_points, alpm_list_count(mount_points), mount_point_cmp); + for(ptr = mount_points; ptr != NULL; ptr = ptr->next) { + mp = ptr->data; + _alpm_log(PM_LOG_DEBUG, "mountpoint: %s\n", mp->mount_dir); + } return(mount_points); } @@ -256,6 +260,7 @@ cleanup: int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) { alpm_list_t *mount_points, *i; + alpm_mountpoint_t *last; size_t replaces = 0, current = 0, numtargs; int abort = 0; alpm_list_t *targ; @@ -266,6 +271,13 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) _alpm_log(PM_LOG_ERROR, _("could not determine filesystem mount points")); return(-1); } + /* due to sorting, the last entry in our mountpoint list should be '/' */ + i = alpm_list_last(mount_points); + last = i->data; + if(strcmp("/", last->mount_dir) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not determine root filesystem mount")); + return(-1); + } replaces = alpm_list_count(trans->remove); if(replaces) { -- 1.7.4.1

4 4