diff options
| author | kitsunyan | 2018-05-05 19:11:02 +0000 |
|---|---|---|
| committer | kitsunyan | 2018-05-05 19:11:02 +0000 |
| commit | b4f8782ab5ca934dac8f1c6dad52fbb3755dc005 (patch) | |
| tree | 59a457ccb8bc6651d179a07400857aa5d5d775c5 | |
| parent | 220c977d972821298db64571e553b6c5bc36d374 (diff) | |
Assume "--noaur" if "--assume-installed" provided
| -rw-r--r-- | src/main.nim | 2 | ||||
| -rw-r--r-- | src/pacman.nim | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/main.nim b/src/main.nim index 10829b8..6280943 100644 --- a/src/main.nim +++ b/src/main.nim @@ -95,7 +95,7 @@ proc handleSync(args: seq[Argument], config: Config): int = execResult(collectedArgs) else: let isNonDefaultRoot = not config.isRootDefault - let isSkipDeps = args.check(%%%"nodeps") + let isSkipDeps = args.check(%%%"nodeps") or args.check(%%%"assume-installed") let isRootNoDrop = currentUser.uid == 0 and not canDropPrivileges() let build = args.check(%%%"build") diff --git a/src/pacman.nim b/src/pacman.nim index 8b85590..4c55f8e 100644 --- a/src/pacman.nim +++ b/src/pacman.nim @@ -176,11 +176,10 @@ const syncConflictingOptions*: seq[ConflictingOptions] = @[ ("asdeps", @["asexplicit"]), - ("build", @["nodeps", "assume-installed", "dbonly", "clean", - "groups", "info", "list", "search", "sysupgrade", "downloadonly"]), + ("build", @["clean", "groups", "info", "list", "search", "sysupgrade", "downloadonly"]), ("keyserver", @["clean", "groups", "info", "list", "search"]), - ("source", @["clean", "groups", "info", "list", "search", "sysupgrade", - "downloadonly", "build", "keyserver", "noaur"]) + ("source", @["clean", "groups", "info", "list", "search", "sysupgrade", "downloadonly", + "build", "keyserver", "noaur"]) ] allConflictingOptions = syncConflictingOptions |