From fcc2aba9803773e95104f55d0097129dffc8e8b5 Mon Sep 17 00:00:00 2001 From: Gunter Labes Date: Sun, 1 Mar 2009 18:08:26 +0000 Subject: [PATCH] use proper git subcommand invocations --- SConstruct | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 8bcb9bd4ce1..6db30ef755e 100644 --- a/SConstruct +++ b/SConstruct @@ -340,12 +340,12 @@ if not env['static_test']: if os.path.exists('.git'): try: - env["svnrev"] = Popen(Split("git-svn find-rev refs/remotes/trunk"), stdout=PIPE, stderr=PIPE).communicate()[0].rstrip("\n") + env["svnrev"] = Popen(Split("git svn find-rev refs/remotes/trunk"), stdout=PIPE, stderr=PIPE).communicate()[0].rstrip("\n") if not env["svnrev"]: - # If you use git-svn for one svn path only there's no refs/remotes/trunk, only git-svn branch - env["svnrev"] = Popen(Split("git-svn find-rev git-svn"), stdout=PIPE, stderr=PIPE).communicate()[0].rstrip("\n") - # if git-svn can't find HEAD it's a local commit - if Popen(Split("git-svn find-rev HEAD"), stdout=PIPE).communicate()[0].rstrip("\n") == "": + # If you use git svn for one svn path only there's no refs/remotes/trunk, only git svn branch + env["svnrev"] = Popen(Split("git svn find-rev git svn"), stdout=PIPE, stderr=PIPE).communicate()[0].rstrip("\n") + # if git svn can't find HEAD it's a local commit + if Popen(Split("git svn find-rev HEAD"), stdout=PIPE).communicate()[0].rstrip("\n") == "": env["svnrev"] += "L" if Popen(Split("git diff --exit-code --quiet")).wait() == 1: env["svnrev"] += "M"