Gentoo Archives: gentoo-commits

From: "André Erdmann" <dywi@×××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/
Date: Wed, 01 Aug 2012 21:11:00
Message-Id: 1343823422.91736d8f9c07b1d64c42b6ddb0ab6b7da80ceb99.dywi@gentoo
1 commit: 91736d8f9c07b1d64c42b6ddb0ab6b7da80ceb99
2 Author: André Erdmann <dywi <AT> mailerd <DOT> de>
3 AuthorDate: Wed Aug 1 12:17:02 2012 +0000
4 Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
5 CommitDate: Wed Aug 1 12:17:02 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=91736d8f
7
8 actually skip manifest creation with --no-manifest
9
10 ---
11 roverlay/overlay/category.py | 13 +++++++------
12 roverlay/overlay/root.py | 12 ++++++------
13 2 files changed, 13 insertions(+), 12 deletions(-)
14
15 diff --git a/roverlay/overlay/category.py b/roverlay/overlay/category.py
16 index 6623446..3551b81 100644
17 --- a/roverlay/overlay/category.py
18 +++ b/roverlay/overlay/category.py
19 @@ -137,7 +137,7 @@ class Category ( object ):
20 overwrite_ebuilds,
21 keep_n_ebuilds,
22 cautious,
23 - skip_manifest=False
24 + write_manifest
25 ):
26 """Writes this category to its filesystem location.
27
28 @@ -205,14 +205,15 @@ class Category ( object ):
29
30 # write manifest files
31 # fixme: debug print
32 - #self.logger.info ( "Writing Manifest files for {}".format ( name ) )
33 - print ( "Writing Manifest files ..." )
34 - for package in self._subdirs.values():
35 - package.write_manifest ( ignore_empty=True )
36 + if write_manifest:
37 + #self.logger.info ( "Writing Manifest files for {}".format ( name ) )
38 + print ( "Writing Manifest files ..." )
39 + for package in self._subdirs.values():
40 + package.write_manifest ( ignore_empty=True )
41
42 else:
43 for package in self._subdirs.values():
44 - package.write ( **write_kwargs )
45 + package.write ( write_manifest=write_manifest, **write_kwargs )
46
47 self.remove_empty()
48 # --- end of write (...) ---
49
50 diff --git a/roverlay/overlay/root.py b/roverlay/overlay/root.py
51 index 53babdf..3efdf66 100644
52 --- a/roverlay/overlay/root.py
53 +++ b/roverlay/overlay/root.py
54 @@ -330,10 +330,10 @@ class Overlay ( object ):
55
56 for cat in self._categories.values():
57 cat.write (
58 - overwrite_ebuilds=False,
59 - keep_n_ebuilds=config.get ( 'OVERLAY.keep_nth_latest', None ),
60 - cautious=True,
61 - skip_manifest=self.skip_manifest
62 + overwrite_ebuilds = False,
63 + keep_n_ebuilds = config.get ( 'OVERLAY.keep_nth_latest', None ),
64 + cautious = True,
65 + write_manifest = not self.skip_manifest
66 )
67 else:
68 # FIXME debug print
69 @@ -353,11 +353,11 @@ class Overlay ( object ):
70
71 returns: None (implicit)
72 """
73 - if self._writeable:
74 + if self._writeable and not self.skip_manifest:
75 # FIXME: it would be good to ensure that profiles/categories exist
76 for cat in self._categories.values():
77 cat.write_manifest ( **manifest_kw )
78 - else:
79 + elif not self.skip_manifest:
80 # FIXME debug print
81 print (
82 "Dropped write_manifest request for readonly overlay {}!".format (