Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Feb 24, 2020. It is now read-only.

stage0: fix message formatting errors, stale forward-vars #3722

Merged
merged 2 commits into from
Jun 20, 2017
Merged

stage0: fix message formatting errors, stale forward-vars #3722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc6597d
Fix message formatting errors
glevand Jun 19, 2017
185fcc0
tests: Remove stale forward-vars
glevand Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ func PathSupportsOverlay(path string) error {

dir, err := os.OpenFile(path, syscall.O_RDONLY|syscall.O_DIRECTORY, 0755)
if err != nil {
return errwrap.Wrap(fmt.Errorf("cannot open %q", dir), err)
return errwrap.Wrap(fmt.Errorf("cannot open %q", path), err)
}
defer dir.Close()

Expand All @@ -437,7 +437,7 @@ func PathSupportsOverlay(path string) error {
// passing the buffer size.
n, err := syscall.ReadDirent(int(dir.Fd()), buf)
if err != nil {
return errwrap.Wrap(fmt.Errorf("cannot read directory %q", dir), err)
return errwrap.Wrap(fmt.Errorf("cannot read directory %q", path), err)
}

offset := 0
Expand Down
4 changes: 2 additions & 2 deletions rkt/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,10 +553,10 @@ func (e *envFileMap) Set(s string) error {
pair := strings.SplitN(line, "=", 2)
// Malformed lines
if len(pair) != 2 || len(pair[0]) == 0 {
return fmt.Errorf("environment variable must be specified as name=value (file %q)", file)
return fmt.Errorf("environment variable must be specified as name=value (file %q)", s)
}
if _, exists := e.mapping[pair[0]]; exists {
return fmt.Errorf("environment variable %q already set (file %q)", pair[0], file)
return fmt.Errorf("environment variable %q already set (file %q)", pair[0], s)
}
e.mapping[pair[0]] = pair[1]
}
Expand Down
1 change: 0 additions & 1 deletion tests/functional.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ include makelib/build_go_bin.mk
# 4 - manifest.json.in
define FTST_GENERATE_ACE_IMAGE

$$(call forward-vars,$2/manifest,ABS_GO)
$2/manifest: $4 | $2
$$(VQ) \
$$(call vb,v2,GEN,$$(call vsp,$$@)) \
Expand Down