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 EE3D61387FF for ; Tue, 21 Oct 2014 05:05:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB26BE08BD; Tue, 21 Oct 2014 05:05:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F023E08AE for ; Tue, 21 Oct 2014 05:05:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E306C340459 for ; Tue, 21 Oct 2014 05:05:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DAC3D8620 for ; Tue, 21 Oct 2014 05:05:08 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1413867848.8902ca15d7b443a6fdfdc011eb968f2d10d2edbb.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:plugin-sync commit in: pym/portage/sync/modules/git/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/sync/modules/git/git.py X-VCS-Directories: pym/portage/sync/modules/git/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8902ca15d7b443a6fdfdc011eb968f2d10d2edbb X-VCS-Branch: plugin-sync Date: Tue, 21 Oct 2014 05:05:08 +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: cc40cc19-e4d1-4c88-adc5-7aad047cac19 X-Archives-Hash: 6371afdc6aceb611a1cba75ab83fa12f commit: 8902ca15d7b443a6fdfdc011eb968f2d10d2edbb Author: Zac Medico gentoo org> AuthorDate: Tue Oct 21 01:49:35 2014 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Oct 21 05:04:08 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8902ca15 git sync: remove unneeded post_sync None of the remaining post_sync code is really needed. Also, fix indent of return near the end of the _sync method. --- pym/portage/sync/modules/git/git.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py index d8c5a32..7c28139 100644 --- a/pym/portage/sync/modules/git/git.py +++ b/pym/portage/sync/modules/git/git.py @@ -69,11 +69,11 @@ class GitSync(SyncBase): msg = "!!! git clone error in %s" % self.repo.location self.logger(self.xterm_titles, msg) writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) - return (exitcode, False) + return (exitcode, False) msg = ">>> Git clone successful" self.logger(self.xterm_titles, msg) writemsg_level(msg + "\n") - return self.post_sync(portdb, self.repo.location, emerge_config) + return (os.EX_OK, True) def _sync(self): @@ -101,18 +101,4 @@ class GitSync(SyncBase): msg = ">>> Git pull successful: %s" % self.repo.location self.logger(self.xterm_titles, msg) writemsg_level(msg + "\n") - return self.post_sync(portdb, self.repo.location, emerge_config) - - - def post_sync(self, portdb, location, emerge_config): - '''repo.sync_type == "git": - # NOTE: Do this after reloading the config, in case - # it did not exist prior to sync, so that the config - # and portdb properly account for its existence. - ''' - # avoid circular import for now - from _emerge.actions import load_emerge_config, adjust_configs - # Reload the whole config from scratch. - settings, trees, mtimedb = load_emerge_config(emerge_config=emerge_config) - adjust_configs(emerge_config.opts, emerge_config.trees) return (os.EX_OK, True)