aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common.nim2
-rw-r--r--src/config.nim14
-rw-r--r--src/feature/syncinstall.nim15
3 files changed, 27 insertions, 4 deletions
diff --git a/src/common.nim b/src/common.nim
index 62966ee..ca6d8c9 100644
--- a/src/common.nim
+++ b/src/common.nim
@@ -5,7 +5,7 @@ import
type
CacheKind* {.pure.} = enum
- repositories
+ repositories, packages
BareKind* {.pure.} = enum
pkg, repo
diff --git a/src/config.nim b/src/config.nim
index b4b9c9a..f0c8710 100644
--- a/src/config.nim
+++ b/src/config.nim
@@ -1,5 +1,5 @@
import
- future, options, posix, re, sets, strutils, tables,
+ future, options, posix, re, sequtils, sets, strutils, tables,
utils
type
@@ -8,6 +8,11 @@ type
colorAuto = "auto",
colorAlways = "always"
+ PreserveBuilt* {.pure.} = enum
+ internal = "Internal",
+ user = "User",
+ disabled = "Disabled"
+
CommonConfig* = object of RootObj
dbs*: seq[string]
arch*: string
@@ -39,6 +44,7 @@ type
printAurNotFound*: bool
sudoExec*: bool
viewNoDefault*: bool
+ preserveBuilt*: PreserveBuilt
preBuildCommand*: Option[string]
proc readConfigFile*(configFile: string):
@@ -144,6 +150,9 @@ proc obtainConfig*(config: PacmanConfig): Config =
let printAurNotFound = options.hasKey("PrintAurNotFound")
let sudoExec = options.hasKey("SudoExec")
let viewNoDefault = options.hasKey("ViewNoDefault")
+ let preserveBuilt = toSeq(enumerate[PreserveBuilt]())
+ .filter(o => some($o) == options.opt("PreserveBuilt"))
+ .optLast.get(PreserveBuilt.disabled)
let preBuildCommand = options.opt("PreBuildCommand")
Config(root: root, db: db, cache: cache,
@@ -153,4 +162,5 @@ proc obtainConfig*(config: PacmanConfig): Config =
verbosePkgList: config.verbosePkgList, pgpKeyserver: config.pgpKeyserver,
ignorePkgs: config.ignorePkgs, ignoreGroups: config.ignoreGroups,
aurComments: aurComments, checkIgnored: checkIgnored, printAurNotFound: printAurNotFound,
- sudoExec: sudoExec, viewNoDefault: viewNoDefault, preBuildCommand: preBuildCommand)
+ sudoExec: sudoExec, viewNoDefault: viewNoDefault, preserveBuilt: preserveBuilt,
+ preBuildCommand: preBuildCommand)
diff --git a/src/feature/syncinstall.nim b/src/feature/syncinstall.nim
index 4d0a564..269777a 100644
--- a/src/feature/syncinstall.nim
+++ b/src/feature/syncinstall.nim
@@ -585,7 +585,20 @@ proc installGroupFromSources(config: Config, commonArgs: seq[Argument],
let asdeps = install.filter(p => not (p.name in explicits)).map(p => p.file)
let asexplicit = install.filter(p => p.name in explicits).map(p => p.file)
- let installParams = sudoPrefix & (pkgLibDir & "/install") & config.cache &
+ let (cacheDir, cacheUser, cacheGroup) = if config.preserveBuilt == PreserveBuilt.internal:
+ (config.cache, 0, 0)
+ elif config.preserveBuilt == PreserveBuilt.user: (block:
+ let error = ensureUserCacheOrError(config, CacheKind.packages, true)
+ for e in error: printError(config.color, e)
+ let user = initialUser.get(currentUser)
+ let dir = config.userCacheInitial.cache(CacheKind.packages)
+ (dir, user.uid, user.gid))
+ else:
+ # pass -1 values to disable caching
+ ("", -1, -1)
+
+ let installParams = sudoPrefix & (pkgLibDir & "/install") &
+ cacheDir & $cacheUser & $cacheGroup &
$pacmanParams.len & pacmanParams & $asdeps.len & asdeps & $asexplicit.len & asexplicit
let code = forkWait(() => execResult(installParams))