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 6892A138202 for ; Tue, 4 Dec 2012 06:01:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ECC921C04A; Tue, 4 Dec 2012 06:01:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8620421C04D for ; Tue, 4 Dec 2012 06:01:07 +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 8065F33D9BA for ; Tue, 4 Dec 2012 06:01:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 20AB9E5436 for ; Tue, 4 Dec 2012 06:01:05 +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: <1354600829.05a0f8f4dc30a08bc5b41655d9f5b8df40cd6d47.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 05a0f8f4dc30a08bc5b41655d9f5b8df40cd6d47 X-VCS-Branch: master Date: Tue, 4 Dec 2012 06:01:05 +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: 60456416-dd23-4d4a-b5f6-2184f3a58fd7 X-Archives-Hash: d66b9b6d13e09bb24c040246262206d8 commit: 05a0f8f4dc30a08bc5b41655d9f5b8df40cd6d47 Author: Zac Medico gentoo org> AuthorDate: Tue Dec 4 06:00:29 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Dec 4 06:00:29 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=05a0f8f4 emerge --sync: search PATH for rsync binary This allows to use rsync from prefix when necessary. --- pym/_emerge/actions.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index e5d4132..d0c3e23 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2095,7 +2095,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): "control (contains %s).\n!!! Aborting rsync sync.\n") % \ (myportdir, vcs_dir), level=logging.ERROR, noiselevel=-1) return 1 - if not os.path.exists("/usr/bin/rsync"): + rsync_binary = portage.process.find_binary("rsync") + if rsync_binary is None: print("!!! /usr/bin/rsync does not exist, so rsync support is disabled.") print("!!! Type \"emerge net-misc/rsync\" to enable rsync support.") sys.exit(1) @@ -2321,7 +2322,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): if mytimestamp != 0 and "--quiet" not in myopts: print(">>> Checking server timestamp ...") - rsynccommand = ["/usr/bin/rsync"] + rsync_opts + extra_rsync_opts + rsynccommand = [rsync_binary] + rsync_opts + extra_rsync_opts if "--debug" in myopts: print(rsynccommand)