December 2015 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v3] makepkg: record build information in .BUILDINFO
by Allan McRae 06 Dec '15

06 Dec '15

This information can be used to reproduce build conditions, which can then be used to determine if a package builds reproducibly. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v3: Remove recording of environmental variables - that was a failure. This should not be controversial now. It records: - buildpath - PKGBUILD hash - installed package list The buildenv and options arrays are moved from .PKGINFO to .BUILDINFO scripts/makepkg.sh.in | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 43584c3..42ec297 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -223,7 +223,7 @@ run_pacman() { else cmd=("$PACMAN_PATH" "$@") fi - if [[ $1 != -@(T|Qq) ]]; then + if [[ $1 != -@(T|Qq|Q) ]]; then if type -p sudo >/dev/null; then cmd=(sudo "${cmd[@]}") else @@ -1147,19 +1147,23 @@ write_pkginfo() { [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }" [[ $makedepends ]] && printf "makedepend = %s\n" "${makedepends[@]}" [[ $checkdepends ]] && printf "checkdepend = %s\n" "${checkdepends[@]}" +} - local it - for it in "${packaging_options[@]}"; do - check_option "$it" "y" - case $? in - 0) - printf "makepkgopt = %s\n" "$it" - ;; - 1) - printf "makepkgopt = %s\n" "!$it" - ;; - esac - done +write_buildinfo() { + msg2 "$(gettext "Generating %s file...")" ".BUILDINFO" + + printf "builddir = %s\n" "${BUILDDIR}" + + local sum="$(openssl dgst -sha256 "${BUILDFILE}")" + sum=${sum##* } + + printf "pkgbuild_sha256sum = %s\n" $sum + + printf "buildenv = %s\n" "${BUILDENV[@]}" + printf "options = %s\n" "${OPTIONS[@]}" + + local pkglist=($(run_pacman -Q | sed "s# #-#")) + printf "installed = %s\n" "${pkglist[@]}" } create_package() { @@ -1176,8 +1180,9 @@ create_package() { pkgarch=$(get_pkg_arch) write_pkginfo > .PKGINFO + write_buildinfo > .BUILDINFO - local comp_files=('.PKGINFO') + local comp_files=('.PKGINFO' '.BUILDINFO') # check for changelog/install files for i in 'changelog/.CHANGELOG' 'install/.INSTALL'; do @@ -1962,6 +1967,15 @@ GPGKEY=${_GPGKEY:-$GPGKEY} PACKAGER=${_PACKAGER:-$PACKAGER} CARCH=${_CARCH:-$CARCH} +# record initial build environment +cppflags="$CPPFLAGS" +cflags="$CFLAGS" +cxxflags="$CXXFLAGS" +ldflags="$LDFLAGS" +debug_cflags="$DEBUG_CFLAGS" +debug_cxxflags="$DEBUG_CXXFLAGS" + + if (( ! INFAKEROOT )); then if (( EUID == 0 )); then error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ -- 2.6.3

1 1

[pacman-dev] [PATCH] alpm_run_chroot: remove dead code
by Andrew Gregory 05 Dec '15

05 Dec '15

Removes a leftover error message from when fdopen and fgets were used to read from the pipe. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/util.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 7e8f85e..3824d13 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -705,11 +705,6 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], } } - /* report error from above after the child has exited */ - if(retval != 0) { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not open pipe (%s)\n"), strerror(errno)); - goto cleanup; - } /* check the return status, make sure it is 0 (success) */ if(WIFEXITED(status)) { _alpm_log(handle, ALPM_LOG_DEBUG, "call to waitpid succeeded\n"); -- 2.6.3

1 0

[pacman-dev] [PATCH] Updated the documentation for makepkg's -L option.
by Alastair Hughes 05 Dec '15

05 Dec '15

At some point back in 2009, logging was expanded to cover all of the packaging functions, but the man page was not updated to reflect that. Fix that! Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> --- doc/makepkg.8.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index faf3e19..bfb0cee 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -103,11 +103,11 @@ Options linkman:pacman[8]. *-L, \--log*:: - Enable makepkg build logging. This will use the *tee* program to send - output of the `build()` function to both the console and to a text file in - the build directory named `pkgname-pkgver-pkgrel-arch.log`. As mentioned - above, the build log will be localized so you may want to set your locale - accordingly if sharing the log output with others. + Enable logging. This will use the *tee* program to send the output of each + of the package functions to both the console and to a text file in the + build directory named `pkgbase-pkgver-pkgrel-arch-pkgfunc.log`. + As mentioned above, the logs will be localized so you may want to set your + locale accordingly if sharing the log output with others. *-m, \--nocolor*:: Disable color in output messages. -- 2.6.3

2 1

[pacman-dev] Broken pacman output when resizing
by Constantin Weißer 05 Dec '15

05 Dec '15

Hi there! As probably everyone noticed one time or the other, pacman output (in particular progress bars) breaks whenever one resizes the terminal, which leads to scrambled output like this: https://paste.xinu.at/LNo/plain This is due to the fact, that pacman always claims the whole terminal width. Whenever one runs pacman in tmux (split pane) or uses a tiling wm, resizing happens quite often and will produce such broken output. Considering the output closely, we have quite some "uninteresting" information there. All the 100% progress bars are actually redundant as pacman does not continue installation (or download) if it cannot retrieve a package. Also, it only downloads one package at a time, so we only really care about the progress of the last package (or total progress). I thus propose a different output: https://paste.xinu.at/m-5XEa/ version1 uses a fixed 100 columns output, version2 a fixed 80 columns output. In version1 it is possible to draw the per package progress at the same line as the package name. When complete, only the package name remains. In both versions the currently downloaded package is always the last line of the output. Both proposals contain an example for per package and total progress. I'm personally in favour of version2, because it seems safe to assume that we always have 80 cols available and it also unifies the output style for both per package and total progress. To sum up the changes shown in the mockups, I propose: * progress bars of database synchronising, download and installation move on line below compared with the current output * when a step is complete, the line with the package (or step) name remains, but without any width-dependent progress bars. For download, you find and example in the link above. For installation a finished steop could look like this: (26/63) upgrading opus So basically just the redundant progress bar is removed here. * The output is limited to 80 columns which should fit nicely as seen in the example. * Other output (such as warnings, errors, new optional deps, ...) remains the same. Is there any interest for such a change? If so, I could develop and provide a patch. I'm also happy about comments, fine-tuning and further improvements to the proposal. -- Constantin

6 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-282-ga8e2578
by allan＠archlinux.org 05 Dec '15

05 Dec '15

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 a8e2578febbb71d1b788c7270c2be57ca1e64dec (commit) via b8a72770619a29db436e2a3883ebe03910a8e827 (commit) via 8089081ef962337d9ff445213cdb160fc47da7c8 (commit) via c74495a3b217249e3a14d616b38367b6dbb006e4 (commit) via 4d2317dafb3c3aac56f9f604262d82fd1b396a19 (commit) via 220a3ce2b8177bb3cc8a7a20715b67d5cbf7fc71 (commit) via 8d11aa3cdf284ebd5b0239b3e3e2f0c39ec7c3ba (commit) via 85508b478e23ef225afccf5ec27dffb39a0300c9 (commit) via 7fb8a299c2a2e18eed21694ba24cf8959aa830dd (commit) via 7b6f7bbe090e9c10c094c998147212ec0c1ba770 (commit) via 16623a7ea577309c8cfb90920ca61342c585f73a (commit) via 4838d250e5fc258bdd52dc31098ed2ad0e44ee40 (commit) via bb5e6c3b767e923fdb6cbdd75a930838c9b2a018 (commit) via 8a373096f590925465f624d7b0bf466b02143ce1 (commit) via 088649534e7fd493cab4fce335f50a68108a48a6 (commit) from dfa4dcb16d42a84a76ed22792f681190aaa60b31 (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 a8e2578febbb71d1b788c7270c2be57ca1e64dec Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Dec 4 14:27:41 2015 -0500 remove soft interrupt handler before cleanup The soft interrupt handler dereferences config, causing a segfault if it is called during cleanup. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b8a72770619a29db436e2a3883ebe03910a8e827 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Nov 30 13:07:11 2015 -0500 extract soft interrupt handlers Delays handler setup until after config is set to a valid value to avoid a segmentation fault. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8089081ef962337d9ff445213cdb160fc47da7c8 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Nov 12 18:56:26 2015 -0500 extract SIGSEGV handler Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c74495a3b217249e3a14d616b38367b6dbb006e4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Nov 12 18:51:15 2015 -0500 extract SIGWINCH handler Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4d2317dafb3c3aac56f9f604262d82fd1b396a19 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Nov 30 12:36:30 2015 -0500 move signal handlers to sighandler.[ch] Signals are special because they run asynchronously, making them non-trivial to handle correctly. Move the handlers a separate file to offset them from the normal code and make them easier to separate into individual functions without further cluttering pacman.c Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 220a3ce2b8177bb3cc8a7a20715b67d5cbf7fc71 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Nov 30 12:29:13 2015 -0500 avoid unsafe functions in signal handler signal(7) lists a set of functions that can safely be called from within a signal handler. Even fileno and strlen are not guaranteed to be safe. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8d11aa3cdf284ebd5b0239b3e3e2f0c39ec7c3ba Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Nov 30 12:16:48 2015 -0500 remove SIG_IGN check when setting signal handler Our signal handler provides a way to gracefully interrupt a transaction and should always be set. The check appears to have originally been copied directly from the glibc manual. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 85508b478e23ef225afccf5ec27dffb39a0300c9 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Nov 30 12:10:58 2015 -0500 do not catch SIGTERM On SIGTERM pacman was exiting immediately, even in the middle of a transaction. In this case we should leave the lock file in place as an indication that the database may not be in a consistent state. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7fb8a299c2a2e18eed21694ba24cf8959aa830dd Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Nov 12 18:37:43 2015 -0500 pacman: exit without memory cleanup on signals Memory allocation/deallocation functions are not safe to call from signal handlers. Just remove the lock file if there is one and exit immediately. Fixes: FS#46375, FS#45995, FS#47011 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7b6f7bbe090e9c10c094c998147212ec0c1ba770 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Nov 12 18:06:53 2015 -0500 add and expose alpm_unlock alpm_unlock is a limited version of alpm_release that does nothing but the actual unlinking of the lock file and is therefore safe to call from signal handlers. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 16623a7ea577309c8cfb90920ca61342c585f73a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Thu Nov 12 17:58:01 2015 -0500 handle_unlock: return 0 if lockfile == NULL Returning -1 is useless since we don't provide any way to determine why it failed. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4838d250e5fc258bdd52dc31098ed2ad0e44ee40 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Dec 4 14:14:32 2015 -0500 skip conflicts resolved by file replacement When replacing a file with a directory, any files inside the new directory cannot possibly exist on the filesystem and can be skipped. This allows cross-package symlink-to-directory transitions when there are files with the same name under both the symlinked directory and the new directory. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bb5e6c3b767e923fdb6cbdd75a930838c9b2a018 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Dec 4 14:14:31 2015 -0500 always unlink files before extraction libarchive will not extract a directory over an existing directory symlink, making it impossible to replace a symlink with a directory across packages. Adding the ARCHIVE_EXTRACT_UNLINK and ARCHIVE_EXTRACT_SECURE_SYMLINKS causes libarchive to unlink the existing symlink and prevents it from extracting any paths that contain a symlink, which we should not be doing anyway. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8a373096f590925465f624d7b0bf466b02143ce1 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Dec 4 07:36:01 2015 +1000 Detect potential conflict when symlink to directory is changing to directory When a symlink to a directory is changing to a directory, any package file inside the new directory can create an unexpected conflict with the filesystem. Reported by Neofytos and Luca from Chakra. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 088649534e7fd493cab4fce335f50a68108a48a6 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Nov 29 08:42:56 2015 +1000 Add large file support CFLAGS to pkgconfig file Large file support is enabled by our configure script as required. If anything linking to libalpm does not also define large file support, there will be differences in the size of off_t which are not caught until runtime. Add the required CFLAGS to the pkg-config file so that users of libalpm know what flags are required. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 9 ++ lib/libalpm/add.c | 11 +-- lib/libalpm/alpm.h | 1 + lib/libalpm/conflict.c | 15 ++++ lib/libalpm/handle.c | 21 ++++- lib/libalpm/libalpm.pc.in | 2 +- src/pacman/Makefile.am | 1 + src/pacman/pacman.c | 75 ++-------------- src/pacman/sighandler.c | 119 ++++++++++++++++++++++++++ lib/libalpm/hook.h => src/pacman/sighandler.h | 20 ++--- test/pacman/tests/TESTS | 1 + test/pacman/tests/symlink021.py | 26 ++++++ 12 files changed, 211 insertions(+), 90 deletions(-) create mode 100644 src/pacman/sighandler.c copy lib/libalpm/hook.h => src/pacman/sighandler.h (74%) create mode 100644 test/pacman/tests/symlink021.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pacman-5.0 freeze
by Allan McRae 05 Dec '15

05 Dec '15

Hi all, We are calling a freeze on pacman for the upcoming 5.0 release. This means I will only accept bug fixes and patches that have already been submitted (I know there is a few that need reviewed/pushed so I will go through patchwork and look at them all soon). I realise that the festive season is approaching, so I will push strings to Transifex in the next day. This will have the majority of pacman-5.0 changes, but a couple more may slip in. Feel free to ping any patch that has been "ignored"! Allan

1 0

[pacman-dev] [PATCH] db_update: always clear db flags after update
by Andrew Gregory 05 Dec '15

05 Dec '15

Signature downloading and DB validation was being based on the most recent download status for the DB. If a DB successfully downloaded but a signature did not, db_update would move to the next server. If the next server tried does not have a more recent copy of the DB, db_update would not download the DB again and would forget that the DB had previously been updated. In this case it would skip validation entirely, leaving an updated DB with the original validation status. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/be_sync.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index b09b060..78c1c47 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -177,6 +177,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) char *syncpath; const char *dbext; alpm_list_t *i; + int updated = 0; int ret = -1; mode_t oldmask; alpm_handle_t *handle; @@ -239,8 +240,9 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) ret = _alpm_download(&payload, syncpath, NULL, &final_db_url); _alpm_dload_payload_reset(&payload); + updated = updated || ret == 0; - if(ret == 0 && (level & ALPM_SIG_DATABASE)) { + if(ret != -1 && updated && (level & ALPM_SIG_DATABASE)) { /* an existing sig file is no good at this point */ char *sigpath = _alpm_sigpath(handle, _alpm_db_path(db)); if(!sigpath) { @@ -296,32 +298,31 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) } } - if(ret == 1) { - /* files match, do nothing */ - handle->pm_errno = 0; - goto cleanup; - } else if(ret == -1) { - /* pm_errno was set by the download code */ - _alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n", - alpm_strerror(handle->pm_errno)); - goto cleanup; - } + if(updated) { + /* Cache needs to be rebuilt */ + _alpm_db_free_pkgcache(db); - /* Cache needs to be rebuilt */ - _alpm_db_free_pkgcache(db); + /* clear all status flags regarding validity/existence */ + db->status &= ~DB_STATUS_VALID; + db->status &= ~DB_STATUS_INVALID; + db->status &= ~DB_STATUS_EXISTS; + db->status &= ~DB_STATUS_MISSING; - /* clear all status flags regarding validity/existence */ - db->status &= ~DB_STATUS_VALID; - db->status &= ~DB_STATUS_INVALID; - db->status &= ~DB_STATUS_EXISTS; - db->status &= ~DB_STATUS_MISSING; + /* if the download failed skip validation to preserve the download error */ + if(ret != -1 && sync_db_validate(db) != 0) { + /* pm_errno should be set */ + ret = -1; + } + } - if(sync_db_validate(db)) { - /* pm_errno should be set */ - ret = -1; + if(ret == -1) { + /* pm_errno was set by the download code */ + _alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n", + alpm_strerror(handle->pm_errno)); + } else { + handle->pm_errno = 0; } -cleanup: _alpm_handle_unlock(handle); free(syncpath); umask(oldmask); -- 2.6.3

1 0

[pacman-dev] [PATCH 01/11] handle_unlock: return 0 if lockfile == NULL
by Andrew Gregory 05 Dec '15

05 Dec '15

Returning -1 is useless since we don't provide any way to determine why it failed. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/handle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 98420b0..b2a10c8 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -129,7 +129,7 @@ int _alpm_handle_lock(alpm_handle_t *handle) /** Remove a lock file */ int _alpm_handle_unlock(alpm_handle_t *handle) { - ASSERT(handle->lockfile != NULL, return -1); + ASSERT(handle->lockfile != NULL, return 0); ASSERT(handle->lockfd >= 0, return 0); close(handle->lockfd); -- 2.6.3

2 11

[pacman-dev] [PATCH] Detect potental confict when symlink to directory is changing to directory
by Allan McRae 05 Dec '15

05 Dec '15

When a symlink to a directory is changing to a directory and takes a file with it, pacman does not result the path of the file on the filesystem when checking for conflicts. Reported by Neofytos and Luca from Chakra. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This only works based on pacmans return failure. Why is the usr/include/bar being detected as a directory and not a symlink? test/pacman/tests/TESTS | 1 + test/pacman/tests/symlink021.py | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 test/pacman/tests/symlink021.py diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index e330896..bee7c8e 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -150,6 +150,7 @@ TESTS += test/pacman/tests/symlink010.py TESTS += test/pacman/tests/symlink011.py TESTS += test/pacman/tests/symlink012.py TESTS += test/pacman/tests/symlink020.py +TESTS += test/pacman/tests/symlink021.py TESTS += test/pacman/tests/sync-install-assumeinstalled.py TESTS += test/pacman/tests/sync-nodepversion01.py TESTS += test/pacman/tests/sync-nodepversion02.py diff --git a/test/pacman/tests/symlink021.py b/test/pacman/tests/symlink021.py new file mode 100644 index 0000000..800094d --- /dev/null +++ b/test/pacman/tests/symlink021.py @@ -0,0 +1,27 @@ +self.description = "symlink -> dir replacment with file move" + +lp1 = pmpkg("pkg1") +lp1.files = ["usr/include/foo/", + "usr/include/bar -> foo", + "usr/include/foo/header.h"] +self.addpkg2db("local", lp1) + +sp1 = pmpkg("pkg1", "1.0-2") +sp1.files = ["usr/include/foo/"] +self.addpkg2db("sync", sp1) + +sp2 = pmpkg("pkg2", "1.0-2") +sp2.files = ["usr/include/bar/", + "usr/include/bar/header.h"] +self.addpkg2db("sync", sp2) + + +self.args = "-S %s %s" % (sp1.name, sp2.name) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("FILE_TYPE=usr/include/foo|dir") +self.addrule("FILE_TYPE=usr/include/bar|dir") +self.addrule("FILE_EXIST=usr/include/foo/header.h") +self.addrule("FILE_EXIST=usr/include/bar/header.h") + +self.expectfailure = True -- 2.6.3

2 4