[ARVADOS] updated: 648aaa04080e11b0a793d6100260770b878b24c0

[Git user]

Summary of changes:
 services/arv-git-httpd/gitolite_test.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

       via  648aaa04080e11b0a793d6100260770b878b24c0 (commit)
      from  c6df16d2af30e989bcfb04f6ef730cde658a9dc9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 648aaa04080e11b0a793d6100260770b878b24c0
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Mar 9 13:58:29 2016 -0500

    Remove duplicate environment variable.
    
    Fixes tests failing after perl security fix.
    
    "Previously on a duplicate, %ENV would have the last entry for the name
    from environ[], but a typical getenv() would return the first entry."
    
    refs:
    * http://perl5.git.perl.org/perl.git/commitdiff/ae37b791a73a9e78dedb89fb2429d2628cf58076
    * https://security-tracker.debian.org/tracker/CVE-2016-2381
    
    No issue #

diff --git a/services/arv-git-httpd/gitolite_test.go b/services/arv-git-httpd/gitolite_test.go
index aa71026..20bdae7 100644
--- a/services/arv-git-httpd/gitolite_test.go
+++ b/services/arv-git-httpd/gitolite_test.go
@@ -1,9 +1,10 @@
 package main
 
 import (
+	"io/ioutil"
 	"os"
 	"os/exec"
-	"io/ioutil"
+	"strings"
 
 	check "gopkg.in/check.v1"
 )
@@ -26,7 +27,12 @@ func (s *GitoliteSuite) SetUpTest(c *check.C) {
 		c.Log(prog, " ", args)
 		cmd := exec.Command(prog, args...)
 		cmd.Dir = s.gitoliteHome
-		cmd.Env = append(os.Environ(), "HOME=" + s.gitoliteHome)
+		cmd.Env = []string{"HOME=" + s.gitoliteHome}
+		for _, e := range os.Environ() {
+			if !strings.HasPrefix(e, "HOME=") {
+				cmd.Env = append(cmd.Env, e)
+			}
+		}
 		diags, err := cmd.CombinedOutput()
 		c.Log(string(diags))
 		c.Assert(err, check.Equals, nil)
@@ -76,13 +82,13 @@ func (s *GitoliteSuite) TestPush(c *check.C) {
 	// Check that the commit hash appears in the gitolite log, as
 	// assurance that the gitolite hooks really did run.
 
-	sha1, err := exec.Command("git", "--git-dir", s.tmpWorkdir + "/.git",
+	sha1, err := exec.Command("git", "--git-dir", s.tmpWorkdir+"/.git",
 		"log", "-n1", "--format=%H").CombinedOutput()
 	c.Logf("git-log in workdir: %q", string(sha1))
 	c.Assert(err, check.Equals, nil)
 	c.Assert(len(sha1), check.Equals, 41)
 
-	gitoliteLog, err := exec.Command("grep", "-r", string(sha1[:40]), s.gitoliteHome + "/.gitolite/logs").CombinedOutput()
+	gitoliteLog, err := exec.Command("grep", "-r", string(sha1[:40]), s.gitoliteHome+"/.gitolite/logs").CombinedOutput()
 	c.Check(err, check.Equals, nil)
 	c.Logf("gitolite log message: %q", string(gitoliteLog))
 }

-----------------------------------------------------------------------


hooks/post-receive
--