Merge pull request #7 from Mstrodl/feature/parallel-downloads

Parallel downloads
aboe76 · Mar 10, 2022 · b751d6a · b751d6a
2 parents 5668cfa + a14df15
commit b751d6a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -24,7 +24,6 @@
   $holdpkg            = $pacman::holdpkg,
   $xfercommand        = $pacman::xfercommand,
   $cleanmethod        = $pacman::cleanmethod,
-  $usedelta           = $pacman::usedelta,
   $architecture       = $pacman::architecture,
   # pacman package options
   $ignorepkg          = $pacman::ignorepkg,
@@ -36,6 +35,7 @@
   $totaldownload      = $pacman::totaldownload,
   $checkspace         = $pacman::checkspace,
   $verbosepkglist     = $pacman::verbosepkglist,
+  $paralleldownloads  = $pacman::paralleldownloads,
   # pacman sec options
   $mainsiglevel       = $pacman::mainsiglevel,
   $localfilesiglevel  = $pacman::localfilesiglevel,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -26,7 +26,6 @@
   $holdpkg            = $pacman::params::holdpkg,
   $xfercommand        = $pacman::params::xfercommand,
   $cleanmethod        = $pacman::params::cleanmethod,
-  $usedelta           = $pacman::params::usedelta,
   $architecture       = $pacman::params::architecture,
   # pacman package options
   $ignorepkg          = $pacman::params::ignorepkg,
@@ -38,6 +37,7 @@
   $totaldownload      = $pacman::params::totaldownload,
   $checkspace         = $pacman::params::checkspace,
   $verbosepkglist     = $pacman::params::verbosepkglist,
+  $paralleldownloads  = $pacman::params::paralleldownloads,
   # pacman sec options
   $mainsiglevel       = $pacman::params::mainsiglevel,
   $localfilesiglevel  = $pacman::params::localfilesiglevel,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -15,7 +15,6 @@
       $holdpkg = 'pacman glibc'
       $xfercommand = undef
       $cleanmethod = 'KeepInstalled'
-      $usedelta = '0.7'
       $architecture = 'auto'
       # pacman package options
       $ignorepkg = undef
@@ -27,6 +26,7 @@
       $totaldownload = false
       $checkspace = true
       $verbosepkglist = false
+      $paralleldownloads = undef
       # pacman sec options
       $mainsiglevel = 'Required DatabaseOptional'
       $localfilesiglevel = 'Optional'

diff --git a/templates/pacman.conf.main.erb b/templates/pacman.conf.main.erb
@@ -36,9 +36,6 @@ XferCommand  = <%= @xfercommand %>
 #CleanMethod = KeepInstalled
 CleanMethod  = <%= @cleanmethod %>
 
-#UseDelta    = 0.7
-UseDelta     = <%= @usedelta %>
-
 #Architecture = auto
 Architecture  = <%= @architecture %>
 
@@ -70,6 +67,10 @@ CheckSpace
 <% if @verbosepkglist -%>
 VerbosePkgLists
 <% end -%>
+#ParallelDownloads = 5
+<% if @paralleldownloads %>
+ParallelDownloads = <%= @paralleldownloads %>
+<% end -%>
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.