Skip to content

Commit

Permalink
Merge pull request Jguer#401 from Morganamilo/deps3
Browse files Browse the repository at this point in the history
Dependency system rewrite
Jguer authored May 30, 2018
2 parents 3381a21 + 1375472 commit c36bfc1
Showing 12 changed files with 1,239 additions and 1,123 deletions.
4 changes: 4 additions & 0 deletions cmd.go
Original file line number Diff line number Diff line change
@@ -296,6 +296,10 @@ func handleConfig(option, value string) bool {
config.SudoLoop = true
case "nosudoloop":
config.SudoLoop = false
case "provides":
config.Provides = true
case "noprovides":
config.Provides = false
default:
return false
}
2 changes: 2 additions & 0 deletions config.go
Original file line number Diff line number Diff line change
@@ -54,6 +54,7 @@ type Configuration struct {
Devel bool `json:"devel"`
CleanAfter bool `json:"cleanAfter"`
GitClone bool `json:"gitclone"`
Provides bool `json:"provides"`
}

var version = "5.688"
@@ -152,6 +153,7 @@ func defaultSettings(config *Configuration) {
config.AnswerEdit = ""
config.AnswerUpgrade = ""
config.GitClone = true
config.Provides = true
}

// Editor returns the preferred system editor.
354 changes: 0 additions & 354 deletions conflicts.go

This file was deleted.

Loading
Oops, something went wrong.

0 comments on commit c36bfc1

Please sign in to comment.