July 2011 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.3-423-g1ce7f39
by dan＠archlinux.org 03 Jul '11

03 Jul '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 1ce7f39ad73c5c96870c6036014afad3d49a8edf (commit) via c839415e3fb4bcde11de3cb7595cec93501bed13 (commit) via 26195f8da1c860a9f79f2d20ab576b06dad55e00 (commit) via 6a6fc3107f477e579b0dd21553d48e073e3efdf4 (commit) via a2995f586e492e0d2cb85e7e9ebb5f3857891465 (commit) via 06840f14b465d9db53646ab0cbc2d4b3526bd255 (commit) via a7b02d07f49927b11ab2d3bec41013c3a9e90283 (commit) via ab79b13079ea6c0c7b66e4c5d14686f06ba759ae (commit) via f612e5ede7f76458911b78adca3323c61a669dd0 (commit) via 925d74f38d21121440edad3f7917c4326e2bd1db (commit) via de8b9a85a571716926e6b0f1a680fbb1d1cc8e94 (commit) via afc96f2ab3d05f14a73e81f871164f01423b5572 (commit) via bd88a8d5511c24db55dd2a5c04161918571dbfbd (commit) via 495ba26e63ec5cb6b8def29f4e22ea7c444348d8 (commit) via 3189d3bc4a7b5f3e92db14256e307e9a58071b2a (commit) via 39262acab6b956bbc4491d3b90e967a09828e732 (commit) via ca43fdd92f06a6997c53e45bfed6fb27f3044de5 (commit) via d796d1cdda15889fc0793eae50582d75f07d55d5 (commit) via f818f570c555668314fa9ca657fba2fe3ffd8bd4 (commit) via eb39a9482b711d58a6c12840800f2372dee0c120 (commit) from cf1401a04d5179c89af6460b812e171cc2da19f0 (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 1ce7f39ad73c5c96870c6036014afad3d49a8edf Merge: c839415 afc96f2 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 3 14:44:57 2011 -0500 Merge remote-tracking branch 'allan/ALPM' Conflicts: lib/libalpm/be_local.c lib/libalpm/be_package.c lib/libalpm/conflict.c lib/libalpm/diskspace.c lib/libalpm/dload.c lib/libalpm/remove.c commit c839415e3fb4bcde11de3cb7595cec93501bed13 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 15:40:02 2011 -0500 conflict code tweaks and cleanups We can take advantage of a few things on our new and improved filelist in this code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 26195f8da1c860a9f79f2d20ab576b06dad55e00 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 14:51:04 2011 -0500 diskspace: remove all libarchive usage Now that the filelists capture mode and size information, we can read the data from there and prevent having to loop through and uncompress every archive to check required diskspace usage. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6a6fc3107f477e579b0dd21553d48e073e3efdf4 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 13:16:49 2011 -0500 Move alpm filelists to a struct object This allows us to capture size and mode data when building filelists from package files. Future patches will take advantage of this newly available information, and frontends can use it as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a2995f586e492e0d2cb85e7e9ebb5f3857891465 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jun 16 15:38:02 2011 -0500 pactest: add a few more checks to fileconflict checks Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 06840f14b465d9db53646ab0cbc2d4b3526bd255 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 3 10:31:03 2011 -0500 Fix debug logger without a newline Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7b02d07f49927b11ab2d3bec41013c3a9e90283 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 3 10:18:00 2011 +1000 Do not replicate files list when removing packages This saves replicating the potentially large list of files in a package that is being removed. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ab79b13079ea6c0c7b66e4c5d14686f06ba759ae Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jul 3 10:10:36 2011 +1000 Add alpm_list_previous method Helper function to get the previous item in a list Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f612e5ede7f76458911b78adca3323c61a669dd0 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 3 13:39:13 2011 -0500 checkdeps: remove unnecessary list join and copy We can just perform the same search operation on both lists. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 925d74f38d21121440edad3f7917c4326e2bd1db Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 3 13:37:04 2011 -0500 be_local: use macros in database loading similar to be_sync This removes some of the repetition in the code for reading and parsing database file lines. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit de8b9a85a571716926e6b0f1a680fbb1d1cc8e94 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 3 13:07:19 2011 -0500 be_sync: make READ_NEXT() a no-arg macro We passed in 'line', but not 'buf.line'. In addition, the macros building off of READ_NEXT() assume variable names anyway. Since we only use these macros in one function, might as well simplify them. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit afc96f2ab3d05f14a73e81f871164f01423b5572 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:39 2011 +1000 Prefix _alpm_errno_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bd88a8d5511c24db55dd2a5c04161918571dbfbd Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:39 2011 +1000 Prefix alpm_transprog_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 495ba26e63ec5cb6b8def29f4e22ea7c444348d8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:39 2011 +1000 Prefix alpm_transconv_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3189d3bc4a7b5f3e92db14256e307e9a58071b2a Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:39 2011 +1000 Prefix alpm_transevt_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 39262acab6b956bbc4491d3b90e967a09828e732 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:39 2011 +1000 Prefix alpm_transflag_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ca43fdd92f06a6997c53e45bfed6fb27f3044de5 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:38 2011 +1000 Prefix alpm_loglevel_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d796d1cdda15889fc0793eae50582d75f07d55d5 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:38 2011 +1000 Prefix alpm_fileconflicttype_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f818f570c555668314fa9ca657fba2fe3ffd8bd4 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:38 2011 +1000 Prefix alpm_depmod_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> commit eb39a9482b711d58a6c12840800f2372dee0c120 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 2 02:01:38 2011 +1000 Prefix alpm_pkgreason_t members with ALPM Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 166 +++++++++++----------- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 255 +++++++++++++++++---------------- lib/libalpm/alpm_list.c | 18 +++ lib/libalpm/alpm_list.h | 1 + lib/libalpm/be_local.c | 193 +++++++++++--------------- lib/libalpm/be_package.c | 72 ++++++----- lib/libalpm/be_sync.c | 90 ++++++------ lib/libalpm/conflict.c | 131 ++++++++++-------- lib/libalpm/conflict.h | 3 + lib/libalpm/db.c | 70 +++++----- lib/libalpm/delta.c | 4 +- lib/libalpm/deps.c | 100 +++++++------- lib/libalpm/diskspace.c | 87 ++++-------- lib/libalpm/dload.c | 30 ++-- lib/libalpm/error.c | 102 +++++++------- lib/libalpm/handle.c | 30 ++-- lib/libalpm/log.c | 6 +- lib/libalpm/package.c | 42 +++++- lib/libalpm/package.h | 4 + lib/libalpm/remove.c | 161 +++++++++++----------- lib/libalpm/signing.c | 56 ++++---- lib/libalpm/sync.c | 174 ++++++++++++------------ lib/libalpm/trans.c | 54 ++++---- lib/libalpm/util.c | 56 ++++---- lib/libalpm/util.h | 4 +- src/pacman/callback.c | 80 ++++++------ src/pacman/conf.c | 110 ++++++++-------- src/pacman/database.c | 16 +- src/pacman/package.c | 16 +- src/pacman/pacman.c | 66 +++++----- src/pacman/query.c | 38 +++--- src/pacman/remove.c | 18 ++-- src/pacman/sync.c | 70 +++++----- src/pacman/upgrade.c | 28 ++-- src/pacman/util.c | 28 ++-- src/util/cleanupdelta.c | 6 +- src/util/testdb.c | 4 +- src/util/testpkg.c | 10 +- test/pacman/tests/fileconflict001.py | 3 + test/pacman/tests/fileconflict002.py | 9 +- 41 files changed, 1220 insertions(+), 1193 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] be_sync: make READ_NEXT() a no-arg macro
by Dan McGee 03 Jul '11

03 Jul '11

We passed in 'line', but not 'buf.line'. In addition, the macros building off of READ_NEXT() assume variable names anyway. Since we only use these macros in one function, might as well simplify them. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/be_sync.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index ce418d5..cf12ef7 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -433,19 +433,19 @@ static int sync_db_populate(alpm_db_t *db) return count; } -#define READ_NEXT(s) do { \ +#define READ_NEXT() do { \ if(_alpm_archive_fgets(archive, &buf) != ARCHIVE_OK) goto error; \ - s = _alpm_strtrim(buf.line); \ + line = _alpm_strtrim(buf.line); \ } while(0) #define READ_AND_STORE(f) do { \ - READ_NEXT(line); \ + READ_NEXT(); \ STRDUP(f, line, goto error); \ } while(0) #define READ_AND_STORE_ALL(f) do { \ char *linedup; \ - READ_NEXT(line); \ + READ_NEXT(); \ if(strlen(line) == 0) break; \ STRDUP(linedup, line, goto error); \ f = alpm_list_add(f, linedup); \ @@ -488,13 +488,13 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, char *line = _alpm_strtrim(buf.line); if(strcmp(line, "%NAME%") == 0) { - READ_NEXT(line); + READ_NEXT(); if(strcmp(line, pkg->name) != 0) { _alpm_log(db->handle, PM_LOG_ERROR, _("%s database is inconsistent: name " "mismatch on package %s\n"), db->treename, pkg->name); } } else if(strcmp(line, "%VERSION%") == 0) { - READ_NEXT(line); + READ_NEXT(); if(strcmp(line, pkg->version) != 0) { _alpm_log(db->handle, PM_LOG_ERROR, _("%s database is inconsistent: version " "mismatch on package %s\n"), db->treename, pkg->name); @@ -512,7 +512,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%ARCH%") == 0) { READ_AND_STORE(pkg->arch); } else if(strcmp(line, "%BUILDDATE%") == 0) { - READ_NEXT(line); + READ_NEXT(); pkg->builddate = _alpm_parsedate(line); } else if(strcmp(line, "%PACKAGER%") == 0) { READ_AND_STORE(pkg->packager); @@ -521,20 +521,20 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, * pkginfo_t struct. This can be done b/c CSIZE is currently only used * in sync databases, and SIZE is only used in local databases. */ - READ_NEXT(line); + READ_NEXT(); pkg->size = atol(line); /* also store this value to isize if isize is unset */ if(pkg->isize == 0) { pkg->isize = pkg->size; } } else if(strcmp(line, "%ISIZE%") == 0) { - READ_NEXT(line); + READ_NEXT(); pkg->isize = atol(line); } else if(strcmp(line, "%MD5SUM%") == 0) { READ_AND_STORE(pkg->md5sum); } else if(strcmp(line, "%SHA256SUM%") == 0) { /* we don't do anything with this value right now */ - READ_NEXT(line); + READ_NEXT(); } else if(strcmp(line, "%PGPSIG%") == 0) { READ_AND_STORE(pkg->base64_sig); } else if(strcmp(line, "%REPLACES%") == 0) { @@ -542,7 +542,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%DEPENDS%") == 0) { /* Different than the rest because of the _alpm_splitdep call. */ while(1) { - READ_NEXT(line); + READ_NEXT(); if(strlen(line) == 0) break; pkg->depends = alpm_list_add(pkg->depends, _alpm_splitdep(line)); } @@ -555,7 +555,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, } else if(strcmp(line, "%DELTAS%") == 0) { /* Different than the rest because of the _alpm_delta_parse call. */ while(1) { - READ_NEXT(line); + READ_NEXT(); if(strlen(line) == 0) break; pkg->deltas = alpm_list_add(pkg->deltas, _alpm_delta_parse(line)); } -- 1.7.6

1 1

[pacman-dev] [PATCH] checkdeps: remove unnecessary list join and copy
by Dan McGee 03 Jul '11

03 Jul '11

We can just perform the same search operation on both lists. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/deps.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 6ca79c3..34f74a5 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -269,22 +269,20 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, alpm_list_t *pkglis alpm_list_t *remove, alpm_list_t *upgrade, int reversedeps) { alpm_list_t *i, *j; - alpm_list_t *targets, *dblist = NULL, *modified = NULL; + alpm_list_t *dblist = NULL, *modified = NULL; alpm_list_t *baddeps = NULL; int nodepversion; CHECK_HANDLE(handle, return NULL); - targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade)); for(i = pkglist; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(_alpm_pkg_find(targets, pkg->name)) { + if(_alpm_pkg_find(remove, pkg->name) || _alpm_pkg_find(upgrade, pkg->name)) { modified = alpm_list_add(modified, pkg); } else { dblist = alpm_list_add(dblist, pkg); } } - alpm_list_free(targets); nodepversion = no_dep_version(handle); -- 1.7.6

1 0

[pacman-dev] [PATCH] makepkg: Add UPX compression support
by Allan McRae 03 Jul '11

03 Jul '11

This patch enables the automatic compression of executable binaries using UPX when the 'upx' options is specified in makepkg.conf or the PKGBUILD. Additional arguments can be passed to UPX by specifying the UPXFLAGS variable. Original-patch-by: Bryce Gibson <bryce(a)gibson-consulting.com.au> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 3 +++ doc/makepkg.conf.5.txt | 6 +++++- etc/makepkg.conf.in | 5 +++-- scripts/makepkg.sh.in | 13 ++++++++++++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 24e1a12..4d76121 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -231,6 +231,9 @@ version. Appending the version yourself disables auto detection. *zipman*;; Compress man and info pages with gzip. + *upx*;; + Compress binary executable files using UPX. + *ccache*;; Allow the use of ccache during build. More useful in its negative form `!ccache` with select packages that have problems building diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 3ce4759..48f5ef5 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -114,7 +114,7 @@ Options Specify a key to use for gpg signing instead of the default key in the keyring. Can be overridden with makepkg's `--key` option. -**OPTIONS=(**strip !docs libtool emptydirs zipman**)**:: +**OPTIONS=(**strip docs libtool emptydirs zipman purge !upx**)**:: This array contains options that affect the default packaging. They are equivalent to options that can be placed in the PKGBUILD; the defaults are shown here. All options should always be left in the array; to enable or @@ -146,6 +146,10 @@ Options Remove files specified by the `PURGE_TARGETS` variable from the package. + *upx*;; + Compress binary executable files using UPX. Additional options + can be passed to UPX by specifying the `UPXFLAGS` variable. + **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this affects both generation and checking. The current valid options are: diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 9a790fc..42ae940 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -60,7 +60,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -69,8 +69,9 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX # -OPTIONS=(strip docs libtool emptydirs zipman purge) +OPTIONS=(strip docs libtool emptydirs zipman purge !upx) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 78cd4cf..b0247bd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -44,7 +44,7 @@ startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" -packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge') +packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') splitpkg_overrides=('pkgver' 'pkgrel' 'pkgdesc' 'arch' 'license' 'groups' \ 'depends' 'optdepends' 'provides' 'conflicts' 'replaces' \ @@ -940,6 +940,17 @@ tidy_install() { msg2 "$(gettext "Removing empty directories...")" find . -depth -type d -empty -delete fi + + if [[ $(check_option upx) = "y" ]]; then + msg2 "$(gettext "Compressing binaries with %s...")" "UPX" + local binary + find . -type f -perm -u+w 2>/dev/null | while read binary ; do + if [[ $(file -bi "$binary") = *'application/x-executable'* ]]; then + upx $UPXFLAGS "$binary" &>/dev/null || + warning "$(gettext "Could not compress binary : %s")" "${binary/$pkgdir\//}" + fi + done + fi } find_libdepends() { -- 1.7.5.4

3 15

[pacman-dev] [PATCH] Add alpm_list_previous method
by Allan McRae 03 Jul '11

03 Jul '11

Helper function to get the previous item in a list Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/alpm_list.c | 18 ++++++++++++++++++ lib/libalpm/alpm_list.h | 1 + 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm_list.c b/lib/libalpm/alpm_list.c index c2b30ad..1976e13 100644 --- a/lib/libalpm/alpm_list.c +++ b/lib/libalpm/alpm_list.c @@ -556,6 +556,24 @@ inline alpm_list_t SYMEXPORT *alpm_list_next(const alpm_list_t *node) } /** + * @brief Get the previous element of a list. + * + * @param list the list head + * @param node the list node + * + * @return the previous element, or NULL when no previous element exist + */ +inline alpm_list_t SYMEXPORT *alpm_list_previous(const alpm_list_t *list, + const alpm_list_t *node) +{ + if(node && node != list) { + return node->prev; + } else { + return NULL; + } +} + +/** * @brief Get the last item in the list. * * @param list the list diff --git a/lib/libalpm/alpm_list.h b/lib/libalpm/alpm_list.h index 1f6393a..27a76d1 100644 --- a/lib/libalpm/alpm_list.h +++ b/lib/libalpm/alpm_list.h @@ -70,6 +70,7 @@ alpm_list_t *alpm_list_reverse(alpm_list_t *list); alpm_list_t *alpm_list_first(const alpm_list_t *list); alpm_list_t *alpm_list_nth(const alpm_list_t *list, size_t n); alpm_list_t *alpm_list_next(const alpm_list_t *list); +alpm_list_t *alpm_list_previous(const alpm_list_t *list, const alpm_list_t *node); alpm_list_t *alpm_list_last(const alpm_list_t *list); void *alpm_list_getdata(const alpm_list_t *entry); -- 1.7.6

1 1

[pacman-dev] [PATCH 1/4] pactest: add a few more checks to fileconflict checks
by Dan McGee 02 Jul '11

02 Jul '11

Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/pacman/tests/fileconflict001.py | 3 +++ test/pacman/tests/fileconflict002.py | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py index 8c13911..dec6151 100644 --- a/test/pacman/tests/fileconflict001.py +++ b/test/pacman/tests/fileconflict001.py @@ -2,6 +2,7 @@ lp = pmpkg("dummy") lp.files = ["dir/realdir/", + "dir/realdir/realfile", "dir/symdir -> realdir"] self.addpkg2db("local", lp) @@ -18,5 +19,7 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") +self.addrule("FILE_EXIST=dir/realdir/realfile") +self.addrule("!FILE_EXIST=dir/realdir/file") self.expectfailure = True diff --git a/test/pacman/tests/fileconflict002.py b/test/pacman/tests/fileconflict002.py index f70873b..e107cd2 100644 --- a/test/pacman/tests/fileconflict002.py +++ b/test/pacman/tests/fileconflict002.py @@ -1,12 +1,16 @@ self.description = "Fileconflict with symlinks (2)" p1 = pmpkg("pkg1") -p1.files = ["dir/realdir/file", +p1.files = ["dir/", + "dir/realdir/", + "dir/realdir/file", "dir/symdir -> realdir"] self.addpkg(p1) p2 = pmpkg("pkg2") -p2.files = ["dir/symdir/file"] +p2.files = ["dir/", + "dir/symdir/", + "dir/symdir/file"] self.addpkg(p2) self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) @@ -14,5 +18,6 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") +self.addrule("!FILE_EXIST=dir/realdir/file") self.expectfailure = True -- 1.7.6

1 3

[pacman-dev] pyalpm transaction initialize
by Yaşar Arabacı 01 Jul '11

01 Jul '11

Hi, I am just trying to figure out the pyalpm. I have no prior knowledge of libalpm itself.(Since I don't know C). I guess I figured out the most parts of using it, but I was wondering if someone can give me example usage of pyalpm.transaction.init() method. Especially the part where I pass arguments to it. What kind of arguments should I pass to that method? (list, tuple, kwargs,str??) I also wonder if I should pass some arguments to pyalpm.transaction.prepare, or I just use it as it is. Thanks in advance Yaşar Arabacı

2 2

[pacman-dev] [PATCH 0/9] PM_* to ALPM_* conversion
by Allan McRae 01 Jul '11

01 Jul '11

After changing types and function names to all have the "alpm" prefix, I assume we also want to do that for the members of our enums. That appears to be the last big change needed for consistent prefixing throughout libalpm. These patches are all available on my ALPM branch. @Dan: Assuming this is fine, I can send you a script that generates this patchset to allow you to "merge" this branch whenever you deem suitable. That should save rebasing time. Allan McRae (9): Prefix alpm_pkgreason_t members with ALPM Prefix alpm_depmod_t members with ALPM Prefix alpm_fileconflicttype_t members with ALPM Prefix alpm_loglevel_t members with ALPM Prefix alpm_transflag_t members with ALPM Prefix alpm_transevt_t members with ALPM Prefix alpm_transconv_t members with ALPM Prefix alpm_transprog_t members with ALPM Prefix _alpm_errno_t members with ALPM lib/libalpm/add.c | 166 +++++++++++++++--------------- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 248 +++++++++++++++++++++++----------------------- lib/libalpm/be_local.c | 60 ++++++------ lib/libalpm/be_package.c | 58 ++++++------ lib/libalpm/be_sync.c | 66 ++++++------ lib/libalpm/conflict.c | 42 ++++---- lib/libalpm/db.c | 70 +++++++------- lib/libalpm/delta.c | 4 +- lib/libalpm/deps.c | 94 +++++++++--------- lib/libalpm/diskspace.c | 40 ++++---- lib/libalpm/dload.c | 30 +++--- lib/libalpm/error.c | 102 ++++++++++---------- lib/libalpm/handle.c | 30 +++--- lib/libalpm/log.c | 6 +- lib/libalpm/package.c | 4 +- lib/libalpm/remove.c | 120 +++++++++++----------- lib/libalpm/signing.c | 56 +++++----- lib/libalpm/sync.c | 174 ++++++++++++++++---------------- lib/libalpm/trans.c | 54 +++++----- lib/libalpm/util.c | 56 +++++----- lib/libalpm/util.h | 4 +- src/pacman/callback.c | 80 ++++++++-------- src/pacman/conf.c | 110 ++++++++++---------- src/pacman/database.c | 16 ++-- src/pacman/package.c | 8 +- src/pacman/pacman.c | 66 ++++++------ src/pacman/query.c | 32 +++--- src/pacman/remove.c | 18 ++-- src/pacman/sync.c | 70 +++++++------- src/pacman/upgrade.c | 28 +++--- src/pacman/util.c | 28 +++--- src/util/cleanupdelta.c | 6 +- src/util/testdb.c | 4 +- src/util/testpkg.c | 10 +- 35 files changed, 981 insertions(+), 981 deletions(-) -- 1.7.6

1 0