From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 72E4E1381FE for ; Wed, 1 Aug 2012 21:11:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 045AFE067D; Wed, 1 Aug 2012 21:10:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B7569E067D for ; Wed, 1 Aug 2012 21:10:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2170A1B402D for ; Wed, 1 Aug 2012 21:10:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D553FE5440 for ; Wed, 1 Aug 2012 21:10:35 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1343823422.91736d8f9c07b1d64c42b6ddb0ab6b7da80ceb99.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/overlay/category.py roverlay/overlay/root.py X-VCS-Directories: roverlay/overlay/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 91736d8f9c07b1d64c42b6ddb0ab6b7da80ceb99 X-VCS-Branch: master Date: Wed, 1 Aug 2012 21:10:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f3d9b00a-1afd-4c5e-9976-566733700344 X-Archives-Hash: 0fd153230342d7b1aa09fd4e1a0c1ef5 commit: 91736d8f9c07b1d64c42b6ddb0ab6b7da80ceb99 Author: André Erdmann mailerd de> AuthorDate: Wed Aug 1 12:17:02 2012 +0000 Commit: André Erdmann mailerd de> CommitDate: Wed Aug 1 12:17:02 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=91736d8f actually skip manifest creation with --no-manifest --- roverlay/overlay/category.py | 13 +++++++------ roverlay/overlay/root.py | 12 ++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/roverlay/overlay/category.py b/roverlay/overlay/category.py index 6623446..3551b81 100644 --- a/roverlay/overlay/category.py +++ b/roverlay/overlay/category.py @@ -137,7 +137,7 @@ class Category ( object ): overwrite_ebuilds, keep_n_ebuilds, cautious, - skip_manifest=False + write_manifest ): """Writes this category to its filesystem location. @@ -205,14 +205,15 @@ class Category ( object ): # write manifest files # fixme: debug print - #self.logger.info ( "Writing Manifest files for {}".format ( name ) ) - print ( "Writing Manifest files ..." ) - for package in self._subdirs.values(): - package.write_manifest ( ignore_empty=True ) + if write_manifest: + #self.logger.info ( "Writing Manifest files for {}".format ( name ) ) + print ( "Writing Manifest files ..." ) + for package in self._subdirs.values(): + package.write_manifest ( ignore_empty=True ) else: for package in self._subdirs.values(): - package.write ( **write_kwargs ) + package.write ( write_manifest=write_manifest, **write_kwargs ) self.remove_empty() # --- end of write (...) --- diff --git a/roverlay/overlay/root.py b/roverlay/overlay/root.py index 53babdf..3efdf66 100644 --- a/roverlay/overlay/root.py +++ b/roverlay/overlay/root.py @@ -330,10 +330,10 @@ class Overlay ( object ): for cat in self._categories.values(): cat.write ( - overwrite_ebuilds=False, - keep_n_ebuilds=config.get ( 'OVERLAY.keep_nth_latest', None ), - cautious=True, - skip_manifest=self.skip_manifest + overwrite_ebuilds = False, + keep_n_ebuilds = config.get ( 'OVERLAY.keep_nth_latest', None ), + cautious = True, + write_manifest = not self.skip_manifest ) else: # FIXME debug print @@ -353,11 +353,11 @@ class Overlay ( object ): returns: None (implicit) """ - if self._writeable: + if self._writeable and not self.skip_manifest: # FIXME: it would be good to ensure that profiles/categories exist for cat in self._categories.values(): cat.write_manifest ( **manifest_kw ) - else: + elif not self.skip_manifest: # FIXME debug print print ( "Dropped write_manifest request for readonly overlay {}!".format (