Snappy

Merge lp:~sergiusens/snappy/backportReviewNOT into lp:~snappy-dev/snappy/snappy-moved-to-github

  1. backportReviewNOT
  2. Merge into snappy-moved-to-github
Proposed by Sergio Schvezov
Status: Superseded
Proposed branch: lp:~sergiusens/snappy/backportReviewNOT
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 60 lines (+17/-2) (has conflicts)
2 files modified
snappy/build.go (+8/-0)
snappy/build_test.go (+9/-2)
Text conflict in snappy/build_test.go
To merge this branch: bzr merge lp:~sergiusens/snappy/backportReviewNOT
Reviewer Review Type Date Requested Status
Snappy Developers Pending
Review via email: mp+258548@code.launchpad.net

This proposal has been superseded by a proposal from 2015-05-07.

Commit message

Backport disablement of review tools

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'snappy/build.go'
2--- snappy/build.go 2015-05-07 16:27:46 +0000
3+++ snappy/build.go 2015-05-07 19:49:15 +0000
4@@ -416,6 +416,14 @@
5 return os.Mkdir(dest, info.Mode())
6 }
7
8+ if (info.Mode() & os.ModeSymlink) != 0 {
9+ target, err := os.Readlink(path)
10+ if err != nil {
11+ return err
12+ }
13+ return os.Symlink(target, dest)
14+ }
15+
16 // it's a file. Maybe we can link it?
17 if os.Link(path, dest) == nil {
18 // whee
19
20=== modified file 'snappy/build_test.go'
21--- snappy/build_test.go 2015-05-07 10:34:05 +0000
22+++ snappy/build_test.go 2015-05-07 19:49:15 +0000
23@@ -61,13 +61,14 @@
24 printf "hello world"
25 `
26
27- // a example binary
28+ // an example binary
29 binDir := filepath.Join(tempdir, "bin")
30 err = os.Mkdir(binDir, 0755)
31 c.Assert(err, IsNil)
32 err = ioutil.WriteFile(filepath.Join(binDir, "hello-world"), []byte(helloBinContent), 0755)
33 c.Assert(err, IsNil)
34
35+<<<<<<< TREE
36 // unusual permissions for dir
37 tmpDir := filepath.Join(tempdir, "tmp")
38 err = os.Mkdir(tmpDir, 0755)
39@@ -83,6 +84,12 @@
40 err = os.Chmod(someFile, 0666)
41 c.Assert(err, IsNil)
42
43+=======
44+ // an example symlink
45+ err = os.Symlink("bin/hello-world", filepath.Join(tempdir, "symlink"))
46+ c.Assert(err, IsNil)
47+
48+>>>>>>> MERGE-SOURCE
49 return tempdir
50 }
51
52@@ -131,7 +138,7 @@
53 // check that the content looks sane
54 readFiles, err := exec.Command("dpkg-deb", "-c", "hello_1.0.1_multi.snap").Output()
55 c.Assert(err, IsNil)
56- for _, needle := range []string{"./meta/package.yaml", "./meta/readme.md", "./bin/hello-world"} {
57+ for _, needle := range []string{"./meta/package.yaml", "./meta/readme.md", "./bin/hello-world", "./symlink -> bin/hello-world"} {
58 c.Assert(strings.Contains(string(readFiles), needle), Equals, true)
59 }
60 }

Subscribers

People subscribed via source and target branches