summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/fix-unit-tests13
-rw-r--r--debian/patches/golang-1.3-compat-readdir23
-rw-r--r--debian/patches/golang-1.3-compat-remove-prefix-logging14
-rw-r--r--debian/patches/series3
4 files changed, 53 insertions, 0 deletions
diff --git a/debian/patches/fix-unit-tests b/debian/patches/fix-unit-tests
new file mode 100644
index 0000000..5e914d2
--- /dev/null
+++ b/debian/patches/fix-unit-tests
@@ -0,0 +1,13 @@
+Index: planr/fs_test.go
+===================================================================
+--- planr.orig/fs_test.go
++++ planr/fs_test.go
+@@ -15,7 +15,7 @@ func TestCname(t *testing.T) {
+ }
+
+ for _, vec := range v {
+- got := cname(ROOT, vec.path)
++ got := Cname(ROOT, vec.path)
+
+ if vec.cname != got {
+ t.Fatalf("Cname(%s) = %s, wanted %s", vec.path, got, vec.cname)
diff --git a/debian/patches/golang-1.3-compat-readdir b/debian/patches/golang-1.3-compat-readdir
new file mode 100644
index 0000000..3c429a9
--- /dev/null
+++ b/debian/patches/golang-1.3-compat-readdir
@@ -0,0 +1,23 @@
+Index: planr/fs.go
+===================================================================
+--- planr.orig/fs.go
++++ planr/fs.go
+@@ -116,7 +116,7 @@ func collectFromDir(
+
+ // Read the entries in this directory
+ for {
+- dirs, err := fp.ReadDir(100)
++ dirs, err := fp.Readdir(100)
+ if err == io.EOF {
+ break
+ } else if err != nil {
+@@ -125,8 +125,8 @@ func collectFromDir(
+
+
+ for _, ent := range dirs {
+- child := path.Join(dir, ent.Name())
+ nm := ent.Name()
++ child := path.Join(dir, nm)
+
+ if ent.IsDir() {
+ collectFromDir(child, defaults, cfgs, units)
diff --git a/debian/patches/golang-1.3-compat-remove-prefix-logging b/debian/patches/golang-1.3-compat-remove-prefix-logging
new file mode 100644
index 0000000..072be5d
--- /dev/null
+++ b/debian/patches/golang-1.3-compat-remove-prefix-logging
@@ -0,0 +1,14 @@
+Index: planr/cmd/planr/main.go
+===================================================================
+--- planr.orig/cmd/planr/main.go
++++ planr/cmd/planr/main.go
+@@ -73,8 +73,7 @@ func main() {
+ defer pprof.StopCPUProfile()
+ }
+
+- log.SetFlags(log.Llongfile | log.Lmsgprefix)
+- log.SetPrefix("planr: ")
++ log.SetFlags(log.Llongfile)
+
+ if flag.NArg() < 1 {
+ dieUsage()
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8aa0b3d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+golang-1.3-compat-readdir
+golang-1.3-compat-remove-prefix-logging
+fix-unit-tests