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 AAFC7138CA2 for ; Wed, 22 Apr 2015 16:59:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E003BE0921; Wed, 22 Apr 2015 16:59:41 +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 9A9C8E0921 for ; Wed, 22 Apr 2015 16:59:41 +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 B6E27340A87 for ; Wed, 22 Apr 2015 16:59:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2FA31167ED for ; Wed, 22 Apr 2015 16:59:34 +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: <1429721918.7a16988f4765963896170b92253ebbd4344216ea.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/sync/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/sync/controller.py X-VCS-Directories: pym/portage/sync/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 7a16988f4765963896170b92253ebbd4344216ea X-VCS-Branch: master Date: Wed, 22 Apr 2015 16:59:34 +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: fcdcddbd-d46f-424a-bdb9-5d824608a824 X-Archives-Hash: 629f66a3dbf228862088424f745bf68f commit: 7a16988f4765963896170b92253ebbd4344216ea Author: Brian Dolbec gentoo org> AuthorDate: Wed Apr 22 16:58:38 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Apr 22 16:58:38 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7a16988f portage/sync/controller.py: Fix postsync hook regression (bug 547414) It seems the migration from the portage-utils postsync hook script to the native portage one causes problems. This is due to the fact the portage-utils supplied script did not pass on any arguments, even though emerge did pass on the uri to it. X-Gentoo-Bug: 547414 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=547414 pym/portage/sync/controller.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py index 6dec3c8..307487f 100644 --- a/pym/portage/sync/controller.py +++ b/pym/portage/sync/controller.py @@ -175,8 +175,13 @@ class SyncManager(object): writemsg_level("Spawning post_sync hook: %s\n" % (_unicode_decode(_hooks[filepath])), level=logging.ERROR, noiselevel=4) - retval = portage.process.spawn([filepath, - reponame, dosyncuri, repolocation], env=self.settings.environ()) + if reponame: + retval = portage.process.spawn( + [filepath, reponame, dosyncuri, repolocation], + env=self.settings.environ()) + else: + retval = portage.process.spawn([filepath], + env=self.settings.environ()) if retval != os.EX_OK: writemsg_level(" %s Spawn failed for: %s, %s\n" % (bad("*"), _unicode_decode(_hooks[filepath]), filepath),