[SCM] Packaging for Google Go branch, debian-sid, updated. debian/2%1-3-8-g8f6a836

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 8f6a83627aeedc82db4fef730715e150bef5e0c2
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Apr 18 09:49:19 2012 +0200

    Merge upstream patch to fix homedir issue (http://code.google.com/p/go/source/detail?r=709120aecee0)

diff --git a/debian/patches/014-dont_fail_test_with_missing_homedir.patch b/debian/patches/014-dont_fail_test_with_missing_homedir.patch
index b346860..ac81dd1 100644
--- a/debian/patches/014-dont_fail_test_with_missing_homedir.patch
+++ b/debian/patches/014-dont_fail_test_with_missing_homedir.patch
@@ -1,11 +1,26 @@
 --- a/src/pkg/os/user/user_test.go
 +++ b/src/pkg/os/user/user_test.go
-@@ -35,7 +35,7 @@ func TestCurrent(t *testing.T) {
+@@ -5,7 +5,6 @@
+ package user
+ 
+ import (
+-	"os"
+ 	"runtime"
+ 	"testing"
+ )
+@@ -34,12 +33,11 @@ func TestCurrent(t *testing.T) {
+ 	if err != nil {
  		t.Fatalf("Current: %v", err)
  	}
- 	fi, err := os.Stat(u.HomeDir)
+-	fi, err := os.Stat(u.HomeDir)
 -	if err != nil || !fi.IsDir() {
-+	if err != nil {
- 		t.Errorf("expected a valid HomeDir; stat(%q): err=%v", u.HomeDir, err)
+-		t.Errorf("expected a valid HomeDir; stat(%q): err=%v", u.HomeDir, err)
++	if u.HomeDir == "" {
++		t.Errorf("didn't get a HomeDir")
  	}
  	if u.Username == "" {
+-		t.Fatalf("didn't get a username")
++		t.Errorf("didn't get a username")
+ 	}
+ }
+ 

-- 
Packaging for Google Go