aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Lloyd2019-02-07 06:09:31 +0000
committerGavin Lloyd2019-02-07 06:09:31 +0000
commit1f6a5c6188a80bab511f56cb36eae824765c89d6 (patch)
treec37e5254a55070ad89be19edd045f536ce7c03d7
parentfbb01f7d7c5d3b9830b2cb30b60302711f9e278e (diff)
Add 'PrintLocalIsNewer' config option
Print warnings during upgrade operation when local packages are newer than those found in remote repositories. This was previously a default option, now added as a default config option in pakku.conf.
-rw-r--r--doc/pakku.conf.5.txt4
-rw-r--r--pakku.conf1
-rw-r--r--src/config.nim6
-rw-r--r--src/feature/syncinstall.nim2
4 files changed, 10 insertions, 3 deletions
diff --git a/doc/pakku.conf.5.txt b/doc/pakku.conf.5.txt
index bc840e2..b37ba7f 100644
--- a/doc/pakku.conf.5.txt
+++ b/doc/pakku.conf.5.txt
@@ -43,6 +43,10 @@ Options
Print warnings during upgrade operation when foreign packages were not
found in AUR.
+*PrintLocalIsNewer*::
+ Print warnings during upgrade operation when local packages are newer
+ than those found in remote repositories.
+
*SudoExec*::
Automatically exec the program from root via sudo if it is necessary,
allowing you to enter password for sudo only once.
diff --git a/pakku.conf b/pakku.conf
index 72b5240..ccb018c 100644
--- a/pakku.conf
+++ b/pakku.conf
@@ -9,6 +9,7 @@ AurComments
CheckIgnored
#IgnoreArch
PrintAurNotFound
+PrintLocalIsNewer
#SudoExec
#ViewNoDefault
diff --git a/src/config.nim b/src/config.nim
index 699f12a..fb1f3ae 100644
--- a/src/config.nim
+++ b/src/config.nim
@@ -47,6 +47,7 @@ type
checkIgnored*: bool
ignoreArch*: bool
printAurNotFound*: bool
+ printLocalIsNewer*: bool
sudoExec*: bool
viewNoDefault*: bool
preserveBuilt*: PreserveBuilt
@@ -155,6 +156,7 @@ proc obtainConfig*(config: PacmanConfig): Config =
let checkIgnored = options.hasKey("CheckIgnored")
let ignoreArch = options.hasKey("IgnoreArch")
let printAurNotFound = options.hasKey("PrintAurNotFound")
+ let printLocalIsNewer = options.hasKey("PrintLocalIsNewer")
let sudoExec = options.hasKey("SudoExec")
let viewNoDefault = options.hasKey("ViewNoDefault")
let preserveBuilt = toSeq(enumerate[PreserveBuilt]())
@@ -179,8 +181,8 @@ proc obtainConfig*(config: PacmanConfig): Config =
userCacheCurrent: userCacheCurrent, tmpRootInitial: tmpRootInitial,
tmpRootCurrent: tmpRootCurrent, color: color, aurRepo: aurRepo, aurComments: aurComments,
checkIgnored: checkIgnored, ignoreArch: ignoreArch, printAurNotFound: printAurNotFound,
- sudoExec: sudoExec, viewNoDefault: viewNoDefault, preserveBuilt: preserveBuilt,
- preBuildCommand: preBuildCommand)
+ printLocalIsNewer: printLocalIsNewer, sudoExec: sudoExec, viewNoDefault: viewNoDefault,
+ preserveBuilt: preserveBuilt, preBuildCommand: preBuildCommand)
template withAlpmConfig*(config: Config, passDbs: bool,
handle: untyped, alpmDbs: untyped, errors: untyped, body: untyped): untyped =
diff --git a/src/feature/syncinstall.nim b/src/feature/syncinstall.nim
index cd9240c..a5e9883 100644
--- a/src/feature/syncinstall.nim
+++ b/src/feature/syncinstall.nim
@@ -844,7 +844,7 @@ proc printAllWarnings(config: Config, installed: seq[Installed], rpcInfos: seq[R
not rpcInfoTable.hasKey(inst.name):
printWarning(config.color, tr"$# was not found in AUR" % [inst.name])
- if upgradeCount == 1:
+ if upgradeCount == 1 and config.printLocalIsNewer:
for localIsNewer in localIsNewerSeq:
printWarning(config.color, tra("%s: local (%s) is newer than %s (%s)\n") %
[localIsNewer.name, localIsNewer.version, config.aurRepo, localIsNewer.aurVersion])