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 B7644138A1A for ; Sat, 17 Jan 2015 13:55:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44EB8E08D9; Sat, 17 Jan 2015 13:55:24 +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 B6945E087E for ; Sat, 17 Jan 2015 13:55:23 +0000 (UTC) Received: from pomiot.lan (mgorny-1-pt.tunnel.tserv28.waw1.ipv6.he.net [IPv6:2001:470:70:353::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 3BCF4340100; Sat, 17 Jan 2015 13:55:22 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-portage-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-portage-dev] [PATCH] sync: unify syncing messages and reduce noise Date: Sat, 17 Jan 2015 14:55:14 +0100 Message-Id: <1421502914-5948-1-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 2.2.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 49c68efa-00e6-49af-81f2-3aa067647120 X-Archives-Hash: 455cb6fc08613ee9cf14a14a92808b38 Print single ">>> Syncing repository '%s' into '%s'..." before syncing, and single "=== Sync completed for %s" after successful sync. Remove duplicate in-module clone/pull messages. Instead, verbosely print git commands executed. Remove useless verbosity in pre-sync mkdir. --- pym/portage/sync/controller.py | 8 +++++--- pym/portage/sync/modules/cvs/cvs.py | 6 ------ pym/portage/sync/modules/git/git.py | 31 +++++++++++------------------ pym/portage/sync/modules/rsync/rsync.py | 2 +- pym/portage/sync/modules/svn/svn.py | 6 ------ pym/portage/sync/modules/websync/websync.py | 6 ------ 6 files changed, 18 insertions(+), 41 deletions(-) diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py index 3d217db..128a38e 100644 --- a/pym/portage/sync/controller.py +++ b/pym/portage/sync/controller.py @@ -156,6 +156,10 @@ class SyncManager(object): #print("result:", result, "callback()", self.callback) exitcode, updatecache_flg = result self.exitcode = exitcode + if exitcode == 0: + msg = "=== Sync completed for %s" % self.repo.name + self.logger(self.xterm_titles, msg) + writemsg_level(msg + "\n") if self.callback: self.callback(exitcode, updatecache_flg) return @@ -184,7 +188,7 @@ class SyncManager(object): def pre_sync(self, repo): self.settings, self.trees, self.mtimedb = self.emerge_config self.xterm_titles = "notitles" not in self.settings.features - msg = ">>> Synchronization of repository '%s' located in '%s'..." \ + msg = ">>> Syncing repository '%s' into '%s'..." \ % (repo.name, repo.location) self.logger(self.xterm_titles, msg) writemsg_level(msg + "\n") @@ -255,8 +259,6 @@ class SyncManager(object): if 'gid' in spawn_kwargs: perms['gid'] = spawn_kwargs['gid'] - writemsg_level(">>> '%s' not found, creating it." - % _unicode_decode(repo.location)) portage.util.ensure_dirs(repo.location, **perms) st = os.stat(repo.location) diff --git a/pym/portage/sync/modules/cvs/cvs.py b/pym/portage/sync/modules/cvs/cvs.py index 52d5d9a..2c3c6a3 100644 --- a/pym/portage/sync/modules/cvs/cvs.py +++ b/pym/portage/sync/modules/cvs/cvs.py @@ -28,9 +28,6 @@ class CVSSync(SyncBase): if kwargs: self._kwargs(kwargs) #initial checkout - msg = ">>> Starting initial cvs checkout with %s..." % self.repo.sync_uri - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n") try: os.rmdir(self.repo.location) except OSError as e: @@ -68,9 +65,6 @@ class CVSSync(SyncBase): if cvs_root.startswith("cvs://"): cvs_root = cvs_root[6:] #cvs update - msg = ">>> Starting cvs update with %s..." % self.repo.sync_uri - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n") exitcode = portage.process.spawn_bash( "cd %s; exec cvs -z0 -q update -dP" % \ (portage._shell_quote(self.repo.location),), diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py index 02da037..1b138cc 100644 --- a/pym/portage/sync/modules/git/git.py +++ b/pym/portage/sync/modules/git/git.py @@ -57,29 +57,25 @@ class GitSync(SyncBase): 'Created new directory %s' % self.repo.location) except IOError: return (1, False) - msg = ">>> Cloning git repository from upstream into %s..." % self.repo.location - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n") sync_uri = self.repo.sync_uri if sync_uri.startswith("file://"): sync_uri = sync_uri[6:] depth_arg = '' if self.repo.sync_clone_depth is not None: depth_arg = '--depth %d ' % self.repo.sync_clone_depth - exitcode = portage.process.spawn_bash("cd %s ; %s clone %s%s ." % \ - (portage._shell_quote(self.repo.location), - self.bin_command, - depth_arg, - portage._shell_quote(sync_uri)), + + git_cmd = "%s clone %s%s ." % (self.bin_command, depth_arg, + portage._shell_quote(sync_uri)) + writemsg_level(git_cmd + "\n") + + exitcode = portage.process.spawn_bash("cd %s ; exec %s" % ( + portage._shell_quote(self.repo.location), git_cmd), **portage._native_kwargs(self.spawn_kwargs)) if exitcode != os.EX_OK: 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) - msg = ">>> Git clone successful" - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n") return (os.EX_OK, True) @@ -94,18 +90,15 @@ class GitSync(SyncBase): emerge_config = self.options.get('emerge_config', None) portdb = self.options.get('portdb', None) - msg = ">>> Starting git pull in %s..." % self.repo.location - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n") - exitcode = portage.process.spawn_bash("cd %s ; git pull" % \ - (portage._shell_quote(self.repo.location),), + git_cmd = "%s pull" % self.bin_command + writemsg_level(git_cmd + "\n") + + exitcode = portage.process.spawn_bash("cd %s ; exec %s" % ( + portage._shell_quote(self.repo.location), git_cmd), **portage._native_kwargs(self.spawn_kwargs)) if exitcode != os.EX_OK: msg = "!!! git pull error in %s" % self.repo.location self.logger(self.xterm_titles, msg) writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) return (exitcode, False) - msg = ">>> Git pull successful: %s" % self.repo.location - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n") return (os.EX_OK, True) diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py index b2fb2f8..52d8b0f 100644 --- a/pym/portage/sync/modules/rsync/rsync.py +++ b/pym/portage/sync/modules/rsync/rsync.py @@ -246,7 +246,7 @@ class RsyncSync(SyncBase): def _process_exitcode(self, exitcode, syncuri, out, maxretries): if (exitcode==0): - self.logger(self.xterm_titles, "=== Sync completed with %s" % syncuri) + pass elif exitcode == SERVER_OUT_OF_DATE: exitcode = 1 elif exitcode == EXCEEDED_MAX_RETRIES: diff --git a/pym/portage/sync/modules/svn/svn.py b/pym/portage/sync/modules/svn/svn.py index 0365e90..73c4b83 100644 --- a/pym/portage/sync/modules/svn/svn.py +++ b/pym/portage/sync/modules/svn/svn.py @@ -28,9 +28,6 @@ class SVNSync(SyncBase): if kwargs: self._kwargs(kwargs) #initial checkout - msg = ">>> Starting initial svn checkout with %s..." % self.repo.sync_uri - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n") try: os.rmdir(self.repo.location) except OSError as e: @@ -71,9 +68,6 @@ class SVNSync(SyncBase): if svn_root.startswith("svn://"): svn_root = svn_root[6:] #svn update - msg = ">>> Starting svn update with %s..." % self.repo.sync_uri - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n") exitcode = portage.process.spawn_bash( "cd %s; exec svn update" % \ (portage._shell_quote(self.repo.location),), diff --git a/pym/portage/sync/modules/websync/websync.py b/pym/portage/sync/modules/websync/websync.py index f08ae77..0ad4efb 100644 --- a/pym/portage/sync/modules/websync/websync.py +++ b/pym/portage/sync/modules/websync/websync.py @@ -38,9 +38,6 @@ class WebRsync(SyncBase): emerge_config = self.options.get('emerge_config', None) portdb = self.options.get('portdb', None) - msg = ">>> Starting emerge-webrsync for %s..." % self.repo.location - self.logger(self.xterm_titles, msg) - writemsg_level(msg + "\n") exitcode = portage.process.spawn_bash("%s" % \ (self.bin_command), **portage._native_kwargs(self.spawn_kwargs)) @@ -49,9 +46,6 @@ class WebRsync(SyncBase): self.logger(self.xterm_titles, msg) writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1) return (exitcode, False) - msg = ">>> Emerge-webrsync 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) return (exitcode, True) -- 2.2.1