diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-02-13 17:06:25 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-02-16 11:06:44 +1000 |
| commit | 8803ae3b4d5d90249243b664b02695f7b106b02f (patch) | |
| tree | add04b496faeb70641c1865733edf69b7647ae97 | |
| parent | bc747fbfbf22bdf5bcf3e2b016afdd21bdea6068 (diff) | |
| download | pacman-8803ae3b4d5d90249243b664b02695f7b106b02f.tar.xz | |
pmtest: install filesystem entries before packages
Installing filesystem entries first allows the filesystem to provide
a symlink to a directory. Packages will then be able to use the symlink
as if it were a directory instead of causing an error.
For example:
self.filesystem = ["dir/", "link -> dir/"]
pkg = pmpkg("pkg1")
pkg.files = ["link/file"]
self.addpkg2db("local", pkg)
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | test/pacman/pmtest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index d1415677..6dc0ee64 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -168,15 +168,15 @@ class pmtest(object): # Filesystem vprint(" Populating file system") - for pkg in self.db["local"].pkgs: - vprint("\tinstalling %s" % pkg.fullname()) - pkg.install_package(self.root) for f in self.filesystem: vprint("\t%s" % f) util.mkfile(self.root, f, f) path = os.path.join(self.root, f) if os.path.isfile(path): os.utime(path, (355, 355)) + for pkg in self.db["local"].pkgs: + vprint("\tinstalling %s" % pkg.fullname()) + pkg.install_package(self.root) # Done. vprint(" Taking a snapshot of the file system") |