| 1 |
commit: 420241209ece14404946645b9675c953322c29d8 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 31 19:15:34 2011 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 31 19:15:34 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=42024120 |
| 7 |
|
| 8 |
Add a few defaults options to emerge. |
| 9 |
|
| 10 |
--- |
| 11 |
PMSTestSuite/pm/portagepm.py | 5 ++++- |
| 12 |
1 files changed, 4 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/PMSTestSuite/pm/portagepm.py b/PMSTestSuite/pm/portagepm.py |
| 15 |
index 768ff23..e1ad442 100644 |
| 16 |
--- a/PMSTestSuite/pm/portagepm.py |
| 17 |
+++ b/PMSTestSuite/pm/portagepm.py |
| 18 |
@@ -14,6 +14,8 @@ class PortagePM(PackageManager): |
| 19 |
emerge_path = '/usr/bin/emerge' |
| 20 |
repoman_path = '/usr/bin/repoman' |
| 21 |
|
| 22 |
+ common_emerge_opts = ['--ask', 'n', '--keep-going'] |
| 23 |
+ |
| 24 |
repo_paths = [] |
| 25 |
|
| 26 |
@classmethod |
| 27 |
@@ -36,7 +38,8 @@ class PortagePM(PackageManager): |
| 28 |
os.chdir(startdir) |
| 29 |
|
| 30 |
def spawn_emerge(self, cpvs, opts = []): |
| 31 |
- return subprocess.Popen([self.emerge_path] + opts + self.pm_options |
| 32 |
+ return subprocess.Popen([self.emerge_path] |
| 33 |
+ + self.common_emerge_opts + opts + self.pm_options |
| 34 |
+ ['=%s' % cpv for cpv in cpvs], |
| 35 |
env = {'PORTDIR_OVERLAY': ' '.join(self.repo_paths)}) |
Archives