| 1 |
Author: agaffney |
| 2 |
Date: 2008-03-11 02:59:15 +0000 (Tue, 11 Mar 2008) |
| 3 |
New Revision: 1369 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/modules/catalyst_support.py |
| 8 |
trunk/modules/generic_stage_target.py |
| 9 |
trunk/modules/grp_target.py |
| 10 |
Log: |
| 11 |
Apply additional patches from bug 207862 for CONTENTS generation |
| 12 |
|
| 13 |
Modified: trunk/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- trunk/ChangeLog 2008-03-10 20:50:24 UTC (rev 1368) |
| 16 |
+++ trunk/ChangeLog 2008-03-11 02:59:15 UTC (rev 1369) |
| 17 |
@@ -1,6 +1,11 @@ |
| 18 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 19 |
# $Id: $ |
| 20 |
|
| 21 |
+ 11 Mar 2008; Andrew Gaffney <agaffney@g.o> |
| 22 |
+ modules/catalyst_support.py, modules/generic_stage_target.py, |
| 23 |
+ modules/grp_target.py: |
| 24 |
+ Apply additional patches from bug 207862 for CONTENTS generation |
| 25 |
+ |
| 26 |
10 Mar 2008; Andrew Gaffney <agaffney@g.o> |
| 27 |
targets/grp/grp-chroot.sh: |
| 28 |
Call setup_myemergeopts after changing clst_FETCH |
| 29 |
|
| 30 |
Modified: trunk/modules/catalyst_support.py |
| 31 |
=================================================================== |
| 32 |
--- trunk/modules/catalyst_support.py 2008-03-10 20:50:24 UTC (rev 1368) |
| 33 |
+++ trunk/modules/catalyst_support.py 2008-03-11 02:59:15 UTC (rev 1369) |
| 34 |
@@ -74,10 +74,14 @@ |
| 35 |
_ = 'tar-tvj' |
| 36 |
elif file.endswith('.tar'): |
| 37 |
_ = 'tar-tv' |
| 38 |
- |
| 39 |
- contents_function = _ |
| 40 |
- _ = contents_map[contents_function] |
| 41 |
- return _[0](file,_[1],verbose) |
| 42 |
+ |
| 43 |
+ if _ == 'auto': |
| 44 |
+ warn('File %r has unknown type for automatic detection.' % (file, )) |
| 45 |
+ return None |
| 46 |
+ else: |
| 47 |
+ contents_function = _ |
| 48 |
+ _ = contents_map[contents_function] |
| 49 |
+ return _[0](file,_[1],verbose) |
| 50 |
except: |
| 51 |
raise CatalystError,\ |
| 52 |
"Error generating contents, is appropriate utility (%s) installed on your system?" \ |
| 53 |
|
| 54 |
Modified: trunk/modules/generic_stage_target.py |
| 55 |
=================================================================== |
| 56 |
--- trunk/modules/generic_stage_target.py 2008-03-10 20:50:24 UTC (rev 1368) |
| 57 |
+++ trunk/modules/generic_stage_target.py 2008-03-11 02:59:15 UTC (rev 1369) |
| 58 |
@@ -1648,7 +1648,8 @@ |
| 59 |
for j in array: |
| 60 |
contents=generate_contents(file,contents_function=j,\ |
| 61 |
verbose=self.settings.has_key("VERBOSE")) |
| 62 |
- myf.write(contents) |
| 63 |
+ if contents: |
| 64 |
+ myf.write(contents) |
| 65 |
myf.close() |
| 66 |
|
| 67 |
def gen_digest_file(self,file): |
| 68 |
|
| 69 |
Modified: trunk/modules/grp_target.py |
| 70 |
=================================================================== |
| 71 |
--- trunk/modules/grp_target.py 2008-03-10 20:50:24 UTC (rev 1368) |
| 72 |
+++ trunk/modules/grp_target.py 2008-03-11 02:59:15 UTC (rev 1369) |
| 73 |
@@ -100,7 +100,7 @@ |
| 74 |
files=[filename for filename in files if filename[0] != '.'] |
| 75 |
for i in files: |
| 76 |
if os.path.isfile(normpath(destdir+"/"+i)): |
| 77 |
- self.gen_contents_file(normpath(destdir+"/"+i)) |
| 78 |
+ #self.gen_contents_file(normpath(destdir+"/"+i)) |
| 79 |
self.gen_digest_file(normpath(destdir+"/"+i)) |
| 80 |
|
| 81 |
def set_action_sequence(self): |
| 82 |
|
| 83 |
-- |
| 84 |
gentoo-commits@l.g.o mailing list |
Archives