Attachment 1679966 Details for Bug 1683798 – Fix pacman CacheDir handling

[patch] Fix pacman CacheDir handling

0001-pacman-Fix-pacman-CacheDir-handling.patch (text/plain), 1.47 KB, created by Toolybird on 2020-04-19 07:00:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toolybird

Created: 2020-04-19 07:00:22 UTC

Size: 1.47 KB

patch

obsolete

>From 76b74ac1bd55621b5e59c470337736d5dcb04073 Mon Sep 17 00:00:00 2001
>From: Geoff Toole <toolybird@tuta.io>
>Date: Sun, 19 Apr 2020 16:40:50 +1000
>Subject: pacman: Fix pacman CacheDir handling
>
>Downloads fail when CacheDir directives are present in /etc/pacman.conf
>Filter them out using pacman-conf.
>---
> src/ph_pacman.ml | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/src/ph_pacman.ml b/src/ph_pacman.ml
>index c35668a..b4a6ac0 100644
>--- a/src/ph_pacman.ml
>+++ b/src/ph_pacman.ml
>@@ -170,6 +170,8 @@ let pacman_download_all_packages pkgs dir =
>   (* Because we reuse the same temporary download directory (tdir), this
>    * only downloads each package once, even though each call to pacman will
>    * download dependent packages as well.
>+   *
>+   * CacheDir directives must be filtered out to force pacman downloads.
>    *)
>   List.iter (
>     fun name ->
>@@ -178,12 +180,13 @@ let pacman_download_all_packages pkgs dir =
>         umask 0000
>         cd %s
>         mkdir -p var/lib/pacman
>+        pacman-conf | grep -v CacheDir > tmp.conf
>         %s %s%s -Syw --noconfirm --cachedir=$(pwd) --root=$(pwd) %s
>       "
>         (quote tdir)
>         Config.fakeroot Config.pacman
>         (match !settings.packager_config with
>-         | None -> ""
>+         | None -> " --config tmp.conf --dbpath var/lib/pacman"
>          | Some filename -> " --config " ^ (quote filename))
>         (quoted_list names) in
>       if !settings.debug >= 2 then printf "%s" cmd;
>-- 
>2.26.1
>

Actions: View | Diff

Attachments on bug 1683798: 1539269 | 1555733 | 1679966 | 1691477 | 1691478