- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/3] Make function for sorting filelists available to library
by Allan McRae 18 Jul '12

18 Jul '12

Make files_msort available to the library as sorting a filelist will be useful for packages where the filelist changes after resolving symlinks. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_package.c | 49 +----------------------------------------------- lib/libalpm/package.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/package.h | 1 + 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index dd027f5..ed71be2 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -248,53 +248,6 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * return 0; } -static void files_merge(alpm_file_t a[], alpm_file_t b[], alpm_file_t c[], - size_t m, size_t n) -{ - size_t i = 0, j = 0, k = 0; - while(i < m && j < n) { - if(strcmp(a[i].name, b[j].name) < 0) { - c[k++] = a[i++]; - } else { - c[k++] = b[j++]; - } - } - while(i < m) { - c[k++] = a[i++]; - } - while(j < n) { - c[k++] = b[j++]; - } -} - -static alpm_file_t *files_msort(alpm_file_t *files, size_t n) -{ - alpm_file_t *work; - size_t blocksize = 1; - - CALLOC(work, n, sizeof(alpm_file_t), return NULL); - - for(blocksize = 1; blocksize < n; blocksize *= 2) { - size_t i, max_extent = 0; - for(i = 0; i < n - blocksize; i += 2 * blocksize) { - /* this limits our actual merge to the length of the array, since we will - * not likely be a perfect power of two. */ - size_t right_blocksize = blocksize; - if(i + blocksize * 2 > n) { - right_blocksize = n - i - blocksize; - } - files_merge(files + i, files + i + blocksize, work + i, - blocksize, right_blocksize); - max_extent = i + blocksize + right_blocksize; - } - /* ensure we only copy what we actually touched on this merge pass, - * no more, no less */ - memcpy(files, work, max_extent * sizeof(alpm_file_t)); - } - free(work); - return files; -} - /** * Validate a package. * @param handle the context handle @@ -536,7 +489,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, /* "checking for conflicts" requires a sorted list, ensure that here */ _alpm_log(handle, ALPM_LOG_DEBUG, "sorting package filelist for %s\n", pkgfile); - newpkg->files.files = files_msort(newpkg->files.files, + newpkg->files.files = _alpm_files_msort(newpkg->files.files, newpkg->files.count); } newpkg->infolevel |= INFRQ_FILES; diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 46d1473..8a7b01f 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -459,6 +459,54 @@ int _alpm_files_cmp(const void *f1, const void *f2) return strcmp(file1->name, file2->name); } + +static void files_merge(alpm_file_t a[], alpm_file_t b[], alpm_file_t c[], + size_t m, size_t n) +{ + size_t i = 0, j = 0, k = 0; + while(i < m && j < n) { + if(strcmp(a[i].name, b[j].name) < 0) { + c[k++] = a[i++]; + } else { + c[k++] = b[j++]; + } + } + while(i < m) { + c[k++] = a[i++]; + } + while(j < n) { + c[k++] = b[j++]; + } +} + +alpm_file_t *_alpm_files_msort(alpm_file_t *files, size_t n) +{ + alpm_file_t *work; + size_t blocksize = 1; + + CALLOC(work, n, sizeof(alpm_file_t), return NULL); + + for(blocksize = 1; blocksize < n; blocksize *= 2) { + size_t i, max_extent = 0; + for(i = 0; i < n - blocksize; i += 2 * blocksize) { + /* this limits our actual merge to the length of the array, since we will + * not likely be a perfect power of two. */ + size_t right_blocksize = blocksize; + if(i + blocksize * 2 > n) { + right_blocksize = n - i - blocksize; + } + files_merge(files + i, files + i + blocksize, work + i, + blocksize, right_blocksize); + max_extent = i + blocksize + right_blocksize; + } + /* ensure we only copy what we actually touched on this merge pass, + * no more, no less */ + memcpy(files, work, max_extent * sizeof(alpm_file_t)); + } + free(work); + return files; +} + alpm_pkg_t *_alpm_pkg_new(void) { alpm_pkg_t *pkg; diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index c473549..3c539ef 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -127,6 +127,7 @@ struct __alpm_pkg_t { alpm_file_t *_alpm_file_copy(alpm_file_t *dest, const alpm_file_t *src); int _alpm_files_cmp(const void *f1, const void *f2); +alpm_file_t *_alpm_files_msort(alpm_file_t *files, size_t n); alpm_pkg_t *_alpm_pkg_new(void); int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr); -- 1.7.11.2

1 3

[pacman-dev] [PATCH] Provide a full filelist to the pactests that need it
by Allan McRae 17 Jul '12

17 Jul '12

It turns out when you set the filelist for a package to include "usr/lib/foo" in the pactest suite, it thinks there is only the file "usr/lib/foo" in there... No "usr/" or "usr/lib/" directory. This makes life difficult when testing code that scrolls through a filelist looking for directory entries. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/tests/fileconflict001.py | 8 ++++++-- test/pacman/tests/fileconflict016.py | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py index dec6151..e1371f8 100644 --- a/test/pacman/tests/fileconflict001.py +++ b/test/pacman/tests/fileconflict001.py @@ -7,11 +7,15 @@ self.addpkg2db("local", lp) p1 = pmpkg("pkg1") -p1.files = ["dir/realdir/file"] +p1.files = ["dir/", + "dir/realdir/", + "dir/realdir/file"] 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]) diff --git a/test/pacman/tests/fileconflict016.py b/test/pacman/tests/fileconflict016.py index 93797f6..5625984 100644 --- a/test/pacman/tests/fileconflict016.py +++ b/test/pacman/tests/fileconflict016.py @@ -7,11 +7,14 @@ self.addpkg2db("local", lp1) p1 = pmpkg("pkg1") -p1.files = ["lib/foo"] +p1.files = ["lib/", + "lib/foo"] self.addpkg2db("sync", p1) p2 = pmpkg("pkg2") -p2.files = ["usr/lib/foo"] +p2.files = ["usr/", + "usr/lib/", + "usr/lib/foo"] self.addpkg2db("sync", p2) self.args = "-S pkg1 pkg2" -- 1.7.11.2

1 0

[pacman-dev] package versions with vcs packages
by Christian Hesse 17 Jul '12

17 Jul '12

Hello everybody, hg and svn packages do set vcs revision infos for package versions. Any reason this does not apply to git, cvs and darcs? Using a date string has the drawback that two revisions compiled the same day result in packages with the same version... A patch for git is attached. Any chance to get this merged? I could take a look at darcs and cvs as well. -- main(a){char*c=/* Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/* Chris get my mail address: */=0;b=c[a++];) putchar(b-1/(/* gcc -o sig sig.c && ./sig */b/42*2-3)*42);}

2 2

[pacman-dev] [PATCH] Detect inter-package conflicts between files and directories
by Allan McRae 17 Jul '12

17 Jul '12

Detect a conflict between a file/symlink in one package and a directory in another when both are being installed at once. A side effect is the creation on conflicts between a direcotry symlink and a real directory (e.g lib -> usr/lib in pkg1 and /lib in pkg2). Given we can not guarantee pkg1 is installed before pkg2, this is a genuine conflict. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/conflict.c | 48 +++++++++++++++++++++++++----------- test/pacman/tests/fileconflict002.py | 2 -- test/pacman/tests/fileconflict015.py | 2 -- 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index f3b269f..041ba6f 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -274,28 +274,48 @@ static alpm_list_t *filelist_intersection(alpm_filelist_t *filesA, size_t ctrA = 0, ctrB = 0; while(ctrA < filesA->count && ctrB < filesB->count) { + int cmp, isdirA, isdirB; + alpm_file_t *fileA = filesA->files + ctrA; alpm_file_t *fileB = filesB->files + ctrB; - const char *strA = fileA->name; - const char *strB = fileB->name; - /* skip directories, we don't care about them */ + char *strA = strdup(fileA->name); + char *strB = strdup(fileB->name); + + isdirA = 0; if(strA[strlen(strA)-1] == '/') { + isdirA = 1; + strA[strlen(strA)-1] = '\0'; + } + + isdirB = 0; + if(strB[strlen(strB)-1] == '/') { + isdirB = 1; + strB[strlen(strB)-1] = '\0'; + } + + cmp = strcmp(strA, strB); + if(cmp < 0) { ctrA++; - } else if(strB[strlen(strB)-1] == '/') { + } else if(cmp > 0) { ctrB++; } else { - int cmp = strcmp(strA, strB); - if(cmp < 0) { - ctrA++; - } else if(cmp > 0) { - ctrB++; - } else { - /* item in both, qualifies as an intersect */ + /* TODO: this creates conflicts between a symlink to a directory in + * one package and a real directory in the other. For example, + * lib -> /usr/lib in pkg1 and /lib in pkg2. This would be allowed + * when installing one package at a time _provided_ pkg1 is installed + * first. This will need adjusted if the order of package install can + * be guaranteed to install the symlink first */ + + /* when not directories, item in both qualifies as an intersect */ + if(! (isdirA && isdirB)) { ret = alpm_list_add(ret, fileA); - ctrA++; - ctrB++; } - } + ctrA++; + ctrB++; + } + + free(strA); + free(strB); } return ret; diff --git a/test/pacman/tests/fileconflict002.py b/test/pacman/tests/fileconflict002.py index e107cd2..1e6113c 100644 --- a/test/pacman/tests/fileconflict002.py +++ b/test/pacman/tests/fileconflict002.py @@ -19,5 +19,3 @@ self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") self.addrule("!FILE_EXIST=dir/realdir/file") - -self.expectfailure = True diff --git a/test/pacman/tests/fileconflict015.py b/test/pacman/tests/fileconflict015.py index 78634d7..3c80bbc 100644 --- a/test/pacman/tests/fileconflict015.py +++ b/test/pacman/tests/fileconflict015.py @@ -13,5 +13,3 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") - -self.expectfailure = True -- 1.7.11.2

2 2

[pacman-dev] [IDEA | WHISH] Give pacman the ability to fetch latest news from website before critical updates/upgrades
by Martin Cigorraga 17 Jul '12

17 Jul '12

Hi guys! I was thinking it could be a cool feature if pacman can warn the user every time news are published on our main page by issuing an alert when: 1. issuing a pacman -Syu -- which involves full system upgrade 2. issuing a pacman -S {package} -- providing the package being installed or upgraded is named in the latest news. Furthermore, the alert type could be customized within pacman.conf to show a simple alert message, to actually show the full news or to not show anything at all: 1. Simple message example: "There are some important news you should be aware, please consider visiting: http://www.archlinux.org/\n\n", or "[...] please consider visiting Arch Linux front page.", etc. I myself prefer the first option since most X consoles/terminals can convert the url to a clickable link. 2. Full news shown: "Latest news from 2012-07-14: The /lib directory becomes a symlink\nAll Arch Linux packages have had their files in[...]" A flag in -for example- /var/lib/pacman/sync can be set once the warning or full news are displayed to avoid showing them again if there isn't fresh news to show. I want to make it clear I _do_ check out our front page regularly, I do navigate the forums and I do read our mailing lists for both request help myself and -to try- to help fellow archers as much as my meager free time let me do that, but I still think this would be a great addition to pacman than can make its use a smoother and streamlined experience. Please let me know ff this list isn't the right place to post this feature request so I can post it again in the right place. Best wishes, Martín Cigorraga -- -msx

2 2

[pacman-dev] [PATCH] Do not remove symlink to directory if an installed package use it
by Allan McRae 17 Jul '12

17 Jul '12

If a packge has a directory (e.g. /lib -> usr/lib), do not allow it to be removed if any other package is trying to install a file into that path (e.g. /lib/foo). This is because the local database can become invalidated if the symlink is removed after then package with file /lib/foo is installed (sync702.py). If the symlink is removed before the file is installed (sync701.py), the upgrade is actually a success, but we can not guarantee the ordering so both cases should fail. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/tests/sync701.py | 22 ++++++++++++++++++++++ test/pacman/tests/sync702.py | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 test/pacman/tests/sync701.py create mode 100644 test/pacman/tests/sync702.py diff --git a/test/pacman/tests/sync701.py b/test/pacman/tests/sync701.py new file mode 100644 index 0000000..201f602 --- /dev/null +++ b/test/pacman/tests/sync701.py @@ -0,0 +1,22 @@ +self.description = "do not remove directory symlink if incoming package has file in its path (order 1)" + +lp = pmpkg("pkg1") +lp.files = ["usr/lib/foo", + "lib -> usr/lib"] +self.addpkg2db("local", lp) + +p1 = pmpkg("pkg1", "1.0-2") +p1.files = ["usr/lib/foo"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2") +p2.files = ["lib/bar"] +self.addpkg2db("sync", p2) + +self.args = "-S pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=pkg1|1.0-1") +self.addrule("!PKG_EXIST=pkg2") + +self.expectfailure = True diff --git a/test/pacman/tests/sync702.py b/test/pacman/tests/sync702.py new file mode 100644 index 0000000..ee4eef9 --- /dev/null +++ b/test/pacman/tests/sync702.py @@ -0,0 +1,22 @@ +self.description = "do not remove directory symlink if incoming package has file in its path (order 2)" + +lp = pmpkg("pkg2") +lp.files = ["usr/lib/foo", + "lib -> usr/lib"] +self.addpkg2db("local", lp) + +p1 = pmpkg("pkg1") +p1.files = ["lib/bar"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2", "1.0-2") +p2.files = ["usr/lib/foo"] +self.addpkg2db("sync", p2) + +self.args = "-S pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=pkg2|1.0-1") +self.addrule("!PKG_EXIST=pkg1") + +self.expectfailure = True -- 1.7.11.2

1 1

[pacman-dev] [PATCH] Do not remove symlink to directory if local package uses that path
by Allan McRae 17 Jul '12

17 Jul '12

If we have a symlink to a directory (e.g. /lib -> usr/lib), then we can not remove it if a local package thinks it has files in the symlink directory (e.g. /lib/foo), because this will invalidate the local file database. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/tests/sync700.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 test/pacman/tests/sync700.py diff --git a/test/pacman/tests/sync700.py b/test/pacman/tests/sync700.py new file mode 100644 index 0000000..0002b64 --- /dev/null +++ b/test/pacman/tests/sync700.py @@ -0,0 +1,22 @@ +self.description = "do not remove directory symlink if another package has file in its path" + +lp1 = pmpkg("pkg1") +lp1.files = ["usr/lib/foo", + "lib -> usr/lib"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.files = ["lib/bar"] +self.addpkg2db("local", lp2) + +p = pmpkg("pkg1", "1.0-2") +p.files = ["usr/lib/foo"] +self.addpkg2db("sync", p) + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=pkg1|1.0-1") +self.addrule("FILE_EXIST=/lib/bar") + +self.expectfailure = True -- 1.7.11.2

1 0

[pacman-dev] [PATCH] Split filelist_operation function
by Allan McRae 17 Jul '12

17 Jul '12

To improve conflict checking, we will need to make these functions diverge to an extent where having two separate functions will be preferable. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/conflict.c | 79 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 26 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 7494fd7..f3b269f 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -213,18 +213,12 @@ alpm_list_t SYMEXPORT *alpm_checkconflicts(alpm_handle_t *handle, return _alpm_innerconflicts(handle, pkglist); } -static const int DIFFERENCE = 0; -static const int INTERSECT = 1; -/* Returns a set operation on the provided two lists of files. +/* Returns the difference of the provided two lists of files. * Pre-condition: both lists are sorted! * When done, free the list but NOT the contained data. - * - * Operations: - * DIFFERENCE - a difference operation is performed. filesA - filesB. - * INTERSECT - an intersection operation is performed. filesA & filesB. */ -static alpm_list_t *filelist_operation(alpm_filelist_t *filesA, - alpm_filelist_t *filesB, int operation) +static alpm_list_t *filelist_difference(alpm_filelist_t *filesA, + alpm_filelist_t *filesB) { alpm_list_t *ret = NULL; size_t ctrA = 0, ctrB = 0; @@ -242,26 +236,20 @@ static alpm_list_t *filelist_operation(alpm_filelist_t *filesA, } else { int cmp = strcmp(strA, strB); if(cmp < 0) { - if(operation == DIFFERENCE) { - /* item only in filesA, qualifies as a difference */ - ret = alpm_list_add(ret, fileA); - } + /* item only in filesA, qualifies as a difference */ + ret = alpm_list_add(ret, fileA); ctrA++; } else if(cmp > 0) { ctrB++; } else { - if(operation == INTERSECT) { - /* item in both, qualifies as an intersect */ - ret = alpm_list_add(ret, fileA); - } ctrA++; ctrB++; } - } + } } - /* if doing a difference, ensure we have completely emptied pA */ - while(operation == DIFFERENCE && ctrA < filesA->count) { + /* ensure we have completely emptied pA */ + while(ctrA < filesA->count) { alpm_file_t *fileA = filesA->files + ctrA; const char *strA = fileA->name; /* skip directories */ @@ -274,6 +262,45 @@ static alpm_list_t *filelist_operation(alpm_filelist_t *filesA, return ret; } +/* Returns the intersection of the provided two lists of files. + * Pre-condition: both lists are sorted! + * When done, free the list but NOT the contained data. + */ + +static alpm_list_t *filelist_intersection(alpm_filelist_t *filesA, + alpm_filelist_t *filesB) +{ + alpm_list_t *ret = NULL; + size_t ctrA = 0, ctrB = 0; + + while(ctrA < filesA->count && ctrB < filesB->count) { + alpm_file_t *fileA = filesA->files + ctrA; + alpm_file_t *fileB = filesB->files + ctrB; + const char *strA = fileA->name; + const char *strB = fileB->name; + /* skip directories, we don't care about them */ + if(strA[strlen(strA)-1] == '/') { + ctrA++; + } else if(strB[strlen(strB)-1] == '/') { + ctrB++; + } else { + int cmp = strcmp(strA, strB); + if(cmp < 0) { + ctrA++; + } else if(cmp > 0) { + ctrB++; + } else { + /* item in both, qualifies as an intersect */ + ret = alpm_list_add(ret, fileA); + ctrA++; + ctrB++; + } + } + } + + return ret; +} + /* Adds alpm_fileconflict_t to a conflicts list. Pass the conflicts list, the * conflicting file path, and either two packages or one package and NULL. */ @@ -438,8 +465,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, for(j = i->next; j; j = j->next) { alpm_list_t *common_files; alpm_pkg_t *p2 = j->data; - common_files = filelist_operation(alpm_pkg_get_files(p1), - alpm_pkg_get_files(p2), INTERSECT); + common_files = filelist_intersection(alpm_pkg_get_files(p1), + alpm_pkg_get_files(p2)); if(common_files) { alpm_list_t *k; @@ -471,8 +498,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, if(dbpkg) { alpm_list_t *difference; /* older ver of package currently installed */ - difference = filelist_operation(alpm_pkg_get_files(p1), - alpm_pkg_get_files(dbpkg), DIFFERENCE); + difference = filelist_difference(alpm_pkg_get_files(p1), + alpm_pkg_get_files(dbpkg)); tmpfiles.count = alpm_list_count(difference); tmpfiles.files = alpm_list_to_array(difference, tmpfiles.count, sizeof(alpm_file_t)); @@ -604,7 +631,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, if(handle->pm_errno == ALPM_ERR_MEMORY) { FREELIST(conflicts); if(dbpkg) { - /* only freed if it was generated from filelist_operation() */ + /* only freed if it was generated from filelist_difference() */ free(tmpfiles.files); } return NULL; @@ -612,7 +639,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } } if(dbpkg) { - /* only freed if it was generated from filelist_operation() */ + /* only freed if it was generated from filelist_difference() */ free(tmpfiles.files); } } -- 1.7.11.2

1 0

[pacman-dev] [PATCH] squelch output of installed new optdeps
by Clemens Buchacher 16 Jul '12

16 Jul '12

If an upgraded package version contains new optdeps, the user is notified of that. If the new optdep is already installed, that information is redundant. Instead, do not output new optdeps if they are already installed. Signed-off-by: Clemens Buchacher <drizzd(a)aon.at> --- src/pacman/util.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/pacman/util.c b/src/pacman/util.c index 7f7f6a7..e774fa8 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1192,6 +1192,20 @@ static int depend_cmp(const void *d1, const void *d2) return ret; } +static alpm_list_t *filter_out_installed(alpm_list_t *list) +{ + alpm_list_t *i, *not_installed = NULL; + alpm_db_t *db_local = alpm_get_localdb(config->handle); + + for(i = list; i; i = alpm_list_next(i)) { + if(!alpm_db_get_pkg(db_local, i->data)) + not_installed = alpm_list_add(not_installed, i->data); + } + alpm_list_free(list); + + return not_installed; +} + void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) { alpm_list_t *i, *old, *new, *optdeps, *optstrings = NULL; @@ -1206,6 +1220,8 @@ void display_new_optdepends(alpm_pkg_t *oldpkg, alpm_pkg_t *newpkg) optstrings = alpm_list_add(optstrings, alpm_dep_compute_string(optdep)); } + optstrings = filter_out_installed(optstrings); + if(optstrings) { printf(_("New optional dependencies for %s\n"), alpm_pkg_get_name(newpkg)); unsigned short cols = getcols(fileno(stdout)); -- 1.7.11.2

2 2

[pacman-dev] [PATCH] pactest: conflict between files having same effective path
by Allan McRae 16 Jul '12

16 Jul '12

Note failure to detect a conflict between files having the same effective path across packages due to a directory symlink. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/tests/fileconflict016.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 test/pacman/tests/fileconflict016.py diff --git a/test/pacman/tests/fileconflict016.py b/test/pacman/tests/fileconflict016.py new file mode 100644 index 0000000..93797f6 --- /dev/null +++ b/test/pacman/tests/fileconflict016.py @@ -0,0 +1,23 @@ +self.description = "file conflict with same effective path across packages (directory symlink)" + +lp1 = pmpkg("filesystem", "1.0-1") +lp1.files = ["usr/", + "usr/lib/", + "lib -> usr/lib/"] +self.addpkg2db("local", lp1) + +p1 = pmpkg("pkg1") +p1.files = ["lib/foo"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2") +p2.files = ["usr/lib/foo"] +self.addpkg2db("sync", p2) + +self.args = "-S pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") + +self.expectfailure = True -- 1.7.11.2

1 0