[gentoo-commits] proj/pms-test-suite:master commit in: /, PMSTestSuite/

[Michał Górny]

commit:     a2ea5ae1a6818a5ac12b0cf2f07ccc2aa365f0de
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 11:19:04 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 11:19:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=a2ea5ae1

Drop separate ebuild-generator.

---
 PMSTestSuite/ebuildgen.py  |   18 ------------------
 PMSTestSuite/testrunner.py |   11 ++++++++---
 ebuild-generator           |   12 ------------
 3 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/PMSTestSuite/ebuildgen.py b/PMSTestSuite/ebuildgen.py
deleted file mode 100644
index 4a16625..0000000
--- a/PMSTestSuite/ebuildgen.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#	vim:fileencoding=utf-8
-# (c) 2011 Michał Górny <mgorny@g.o>
-# Released under the terms of the 2-clause BSD license.
-
-from PMSTestSuite.cli import PMSTestSuiteCLI
-
-class EbuildGenCLI(PMSTestSuiteCLI):
-	def main(self, argv):
-		self._start(*argv)
-
-		files = {}
-		for t in self.test_library:
-			files.update(t.get_output_files())
-
-		self.repository.write_files(files)
-		self.repository.remanifest(files, self.pm)
-
-		return 0

diff --git a/PMSTestSuite/testrunner.py b/PMSTestSuite/testrunner.py
index e435093..19c3749 100644
--- a/PMSTestSuite/testrunner.py
+++ b/PMSTestSuite/testrunner.py
@@ -28,10 +28,15 @@ class TestRunnerCLI(EbuildGenCLI):
 		self.loop.quit()
 
 	def main(self, argv):
+		self._start(*argv)
+
 		print('-> Generating ebuilds...')
-		ret = EbuildGenCLI.main(self, argv)
-		if ret != 0:
-			return ret
+		files = {}
+		for t in self.test_library:
+			files.update(t.get_output_files())
+
+		self.repository.write_files(files)
+		self.repository.remanifest(files, self.pm)
 
 		self.pm.append_repository(self.repository)
 		self.cpvs = [t.cpv for t in self.test_library]

diff --git a/ebuild-generator b/ebuild-generator
deleted file mode 100755
index f11ac16..0000000
--- a/ebuild-generator
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/python
-#	vim:fileencoding=utf-8
-# (c) 2011 Michał Górny <mgorny@g.o>
-# Released under the terms of the 2-clause BSD license.
-
-import sys
-
-from PMSTestSuite.ebuildgen import EbuildGenCLI
-
-if __name__ == '__main__':
-	cli = EbuildGenCLI()
-	sys.exit(cli.main(sys.argv))