From 56c570bb01aa738175bcf316461caa95473de659 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 12 Jan 2009 08:26:20 +0000 Subject: Inside action_sync(), check for the git binary when necessary and bail out with a helpful message if it doesn't exist. Thanks to Caleb Cushing for the initial patch. (trunk r12417) svn path=/main/branches/2.1.6/; revision=12473 --- pym/_emerge/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pym/_emerge') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index ddc33d423..bb9dac73f 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -11772,6 +11772,13 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): # going to trust the user and assume that the user is in the branch # that he/she wants updated. We'll let the user manage branches with # git directly. + if portage.process.find_binary("git") is None: + msg = ["Command not found: git", + "Type \"emerge dev-util/git\" to enable git support."] + for l in msg: + writemsg_level("!!! %s\n" % l, + level=logging.ERROR, noiselevel=-1) + return 1 msg = ">>> Starting git pull in %s..." % myportdir emergelog(xterm_titles, msg ) writemsg_level(msg + "\n") -- cgit v1.2.3-1-g7c22