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 7FF70138A1A for ; Fri, 30 Jan 2015 20:06:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57224E08B2; Fri, 30 Jan 2015 20:06:56 +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 B13DDE08B2 for ; Fri, 30 Jan 2015 20:06:55 +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 B02F53407AC for ; Fri, 30 Jan 2015 20:06:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E181110B5C for ; Fri, 30 Jan 2015 20:06:52 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1422648335.a589f4974cc2c753b241e5305b0d74c0546df09d.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/sync/modules/git/, pym/portage/sync/modules/websync/, ... X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/sync/modules/cvs/cvs.py pym/portage/sync/modules/git/git.py pym/portage/sync/modules/svn/svn.py pym/portage/sync/modules/websync/websync.py X-VCS-Directories: pym/portage/sync/modules/svn/ pym/portage/sync/modules/cvs/ pym/portage/sync/modules/git/ pym/portage/sync/modules/websync/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: a589f4974cc2c753b241e5305b0d74c0546df09d X-VCS-Branch: master Date: Fri, 30 Jan 2015 20:06:52 +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: 3f6bf170-45c0-4fec-a23c-ea394510a747 X-Archives-Hash: cdd95fe3a3408ad51a7236903e5f7715 commit: a589f4974cc2c753b241e5305b0d74c0546df09d Author: Brian Dolbec gentoo org> AuthorDate: Thu Jan 29 17:30:49 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Fri Jan 30 20:05:35 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a589f497 portage/sync: Some final pyflakes code cleanup --- pym/portage/sync/modules/cvs/cvs.py | 1 - pym/portage/sync/modules/git/git.py | 6 ------ pym/portage/sync/modules/svn/svn.py | 5 ++--- pym/portage/sync/modules/websync/websync.py | 4 ---- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pym/portage/sync/modules/cvs/cvs.py b/pym/portage/sync/modules/cvs/cvs.py index 9153815..9b382ab 100644 --- a/pym/portage/sync/modules/cvs/cvs.py +++ b/pym/portage/sync/modules/cvs/cvs.py @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 import logging -import errno import portage from portage import os diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py index cea681c..7a710ef 100644 --- a/pym/portage/sync/modules/git/git.py +++ b/pym/portage/sync/modules/git/git.py @@ -36,8 +36,6 @@ class GitSync(NewBase): '''Do the initial clone of the repository''' if kwargs: self._kwargs(kwargs) - emerge_config = self.options.get('emerge_config', None) - portdb = self.options.get('portdb', None) try: if not os.path.exists(self.repo.location): os.makedirs(self.repo.location) @@ -73,10 +71,6 @@ class GitSync(NewBase): that he/she wants updated. We'll let the user manage branches with git directly. ''' - # No kwargs call here; this is internal, so it should have been - # called by something which set the internal variables - emerge_config = self.options.get('emerge_config', None) - portdb = self.options.get('portdb', None) git_cmd = "%s pull" % self.bin_command writemsg_level(git_cmd + "\n") diff --git a/pym/portage/sync/modules/svn/svn.py b/pym/portage/sync/modules/svn/svn.py index 492ada3..da38e6f 100644 --- a/pym/portage/sync/modules/svn/svn.py +++ b/pym/portage/sync/modules/svn/svn.py @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 import logging -import errno import portage from portage import os @@ -55,7 +54,7 @@ class SVNSync(NewBase): @rtype: (int, bool) """ - exitcode, d = self._svn_upgrade() + exitcode = self._svn_upgrade() if exitcode != os.EX_OK: return (exitcode, False) @@ -87,4 +86,4 @@ class SVNSync(NewBase): msg = "!!! svn upgrade error; exiting." self.logger(self.xterm_titles, msg) writemsg_level(msg + "\n", noiselevel=-1, level=logging.ERROR) - return (exitcode, False) + return exitcode diff --git a/pym/portage/sync/modules/websync/websync.py b/pym/portage/sync/modules/websync/websync.py index 17f4ced..c6dcd42 100644 --- a/pym/portage/sync/modules/websync/websync.py +++ b/pym/portage/sync/modules/websync/websync.py @@ -35,9 +35,6 @@ class WebRsync(SyncBase): if not self._has_bin: return (1, False) - emerge_config = self.options.get('emerge_config', None) - portdb = self.options.get('portdb', None) - exitcode = portage.process.spawn_bash("%s" % \ (self.bin_command), **portage._native_kwargs(self.spawn_kwargs)) @@ -46,7 +43,6 @@ class WebRsync(SyncBase): self.logger(self.xterm_titles, msg) writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) return (exitcode, False) - #return self.post_sync(portdb, self.repo.location, emerge_config) return (exitcode, True)