Mercurial > treepkg
comparison test/test_builder.py @ 296:ce7be2fb93ee
Make it easy to install extra binaries into subdirectories of extra-pkg.
This makes it easier to manage the extra-pkg directory when it contains
manually added packages and automatically added packages from one of the
package tracks by putting the automatically added packages into
extra-pkg/auto and manually added packages into extra-pkg/manual.
To this end, add parameter subdir to PBuilder.add_binaries_to_extra_pkg
method with default value "auto". Adapt the test case accordingly.
Also add the command line argument --subdir to bin/treepkgbuilder.py
add-binaries command, this time with default value "manual".
| author | Bernhard Herzog <bh@intevation.de> |
|---|---|
| date | Wed, 18 Nov 2009 18:11:22 +0000 |
| parents | cbcd8f549ff7 |
| children | f06f707d9fda |
comparison
equal
deleted
inserted
replaced
| 295:dcdf23dece2d | 296:ce7be2fb93ee |
|---|---|
| 1 # Copyright (C) 2007, 2008 by Intevation GmbH | 1 # Copyright (C) 2007, 2008, 2009 by Intevation GmbH |
| 2 # Authors: | 2 # Authors: |
| 3 # Bernhard Herzog <bh@intevation.de> | 3 # Bernhard Herzog <bh@intevation.de> |
| 4 # | 4 # |
| 5 # This program is free software under the GPL (>=v2) | 5 # This program is free software under the GPL (>=v2) |
| 6 # Read the file COPYING coming with the software for details. | 6 # Read the file COPYING coming with the software for details. |
| 373 self.assertEquals(os.listdir(self.extra_pkg_dir), []) | 373 self.assertEquals(os.listdir(self.extra_pkg_dir), []) |
| 374 | 374 |
| 375 builder.add_binaries_to_extra_pkg([self.minimal_package_deb]) | 375 builder.add_binaries_to_extra_pkg([self.minimal_package_deb]) |
| 376 | 376 |
| 377 self.assertEquals(sorted(os.listdir(self.extra_pkg_dir)), | 377 self.assertEquals(sorted(os.listdir(self.extra_pkg_dir)), |
| 378 ["Packages", "Release", "minimal_1.0-1_i386.deb"]) | 378 ["Packages", "Release", "auto"]) |
| 379 self.assertEquals(sorted(os.listdir(os.path.join(self.extra_pkg_dir, | |
| 380 "auto"))), | |
| 381 ["minimal_1.0-1_i386.deb"]) | |
| 379 self.check_command_line(['/usr/sbin/pbuilder', 'update', | 382 self.check_command_line(['/usr/sbin/pbuilder', 'update', |
| 380 '--configfile', self.pbuilderrc]) | 383 '--configfile', self.pbuilderrc]) |