github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2705 from ijc/linuxkit-pkg

Browse Source 
linuxkit pkg: Handle build --dev later
This commit is contained in:
Ian Campbell 2017-11-10 13:26:01 +00:00 committed by GitHub
commit 1e2dff62fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cmd/linuxkit/pkglib/pkglib.go
View File

@ -92,16 +92,6 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) {
return Pkg{}, err return Pkg{}, err
} }
if devMode {
// If --org is also used then this will be overwritten
// by argOrg when we iterate over the provided options
// in the fs.Visit block below.
pi.Org = os.Getenv("USER")
if hash == "" {
hash = "dev"
}
}
if hashPath == "" { if hashPath == "" {
hashPath = pkgPath hashPath = pkgPath
} else { } else {
@ -129,6 +119,16 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) {
return Pkg{}, fmt.Errorf("Image field is required") return Pkg{}, fmt.Errorf("Image field is required")
} }
if devMode {
// If --org is also used then this will be overwritten
// by argOrg when we iterate over the provided options
// in the fs.Visit block below.
pi.Org = os.Getenv("USER")
if hash == "" {
hash = "dev"
}
}
// Go's flag package provides no way to see if a flag was set // Go's flag package provides no way to see if a flag was set
// apart from Visit which iterates over only those which were // apart from Visit which iterates over only those which were
// set. // set.