1 |
commit: 402cab389f93837f91bb6146fdca342468f7a2eb |
2 |
Author: Andre Erdmann <dywi <AT> mailerd <DOT> de> |
3 |
AuthorDate: Wed May 30 10:57:14 2012 +0000 |
4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
5 |
CommitDate: Wed May 30 10:58:23 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=402cab38 |
7 |
|
8 |
temporary files: add encoding / run_ebuildcreation update |
9 |
|
10 |
--- |
11 |
run_descreader.py | 1 + |
12 |
run_ebuildcreation.py | 33 +++++++++++++++++++++------------ |
13 |
2 files changed, 22 insertions(+), 12 deletions(-) |
14 |
|
15 |
diff --git a/run_descreader.py b/run_descreader.py |
16 |
index 9ea0c92..b113510 100755 |
17 |
--- a/run_descreader.py |
18 |
+++ b/run_descreader.py |
19 |
@@ -1,4 +1,5 @@ |
20 |
#!/usr/bin/env python3 |
21 |
+# -*- coding: utf-8 -*- |
22 |
# Copyright 2006-2012 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
|
26 |
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py |
27 |
index e67b772..ee9ea49 100755 |
28 |
--- a/run_ebuildcreation.py |
29 |
+++ b/run_ebuildcreation.py |
30 |
@@ -1,28 +1,37 @@ |
31 |
#!/usr/bin/env python3 |
32 |
+# -*- coding: utf-8 -*- |
33 |
# Copyright 2006-2012 Gentoo Foundation |
34 |
# Distributed under the terms of the GNU General Public License v2 |
35 |
|
36 |
import sys |
37 |
|
38 |
-sys.stderr.write ( "<=== run_ebuildcreation start ===>\n" ) |
39 |
+def me ( msg ): |
40 |
+ sys.stderr.write ("<=== run_x " + msg + " ===>\n" ) |
41 |
|
42 |
-try: |
43 |
- import roverlay.ebuildcreator |
44 |
+me ( "start" ) |
45 |
|
46 |
- efac = roverlay.ebuildcreator.EbuildFactory() |
47 |
+try: |
48 |
+ from roverlay.ebuildjob import EbuildJob |
49 |
+ from roverlay.ebuildcreator import EbuildCreator |
50 |
|
51 |
- ebuild_creators = [] |
52 |
+ ec = EbuildCreator () |
53 |
|
54 |
for tarball in sys.argv[1:]: |
55 |
- ec = efac.get_ebuild_creator ( tarball ) |
56 |
- if ec: ebuild_creators.append ( ec ) |
57 |
+ if ec.add_package ( tarball ) is None: |
58 |
+ raise Exception ( "ec.add() returns None, fix that." ) |
59 |
+ |
60 |
+ ec.run () |
61 |
|
62 |
- for job in ebuild_creators: |
63 |
- job.run () |
64 |
+ for e in ec.collect_ebuilds (): |
65 |
+ sys.stderr.write ( '\n[### this is an ebuild: ###]\n' ) |
66 |
+ e.show ( sys.stderr ) |
67 |
+ sys.stderr.write ( '[### this was an ebuild: ###]\n' ) |
68 |
|
69 |
- sys.stderr.write ( "<=== run_ebuildcreation end ===>\n" ) |
70 |
+ me ( "end" ) |
71 |
|
72 |
except Exception as err: |
73 |
- sys.stderr.write ( str ( err ) + "\n" ) |
74 |
- sys.stderr.write ( "<=== run_ebuildcreation failed ===>\n" ) |
75 |
+ print ( str ( err ) ) |
76 |
+ me ( "failed" ) |
77 |
raise |
78 |
+ |
79 |
+ |