diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-02-15 19:22:15 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-02-24 13:11:54 +1000 |
| commit | 083ac51816323d69fcf2e271ccd52add3cdd6d22 (patch) | |
| tree | 868f31977c4229cdf5801cb4e725d2ea96818176 /test/pacman/tests/fileconflict024.py | |
| parent | 9995510dc81ab75fbb7ad7ca4fffedf8a5318bef (diff) | |
| download | pacman-083ac51816323d69fcf2e271ccd52add3cdd6d22.tar.xz | |
return resolved paths from filelist_difference
We were comparing files based on resolved paths but returning the
original file_t structures, which were not necessarily in the same
order. The extra file_t information was only being used to determine if
the file was a directory which can be accomplished by testing for
a trailing slash, so just return the resolved path.
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test/pacman/tests/fileconflict024.py')
| -rw-r--r-- | test/pacman/tests/fileconflict024.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/pacman/tests/fileconflict024.py b/test/pacman/tests/fileconflict024.py index 1dcb5ade..17394db2 100644 --- a/test/pacman/tests/fileconflict024.py +++ b/test/pacman/tests/fileconflict024.py @@ -15,5 +15,3 @@ self.args = "-S %s" % sp1.name self.addrule("PACMAN_RETCODE=1") self.addrule("PKG_EXIST=foo|1-1") - -self.expectfailure = True |