Attachment 1691478 Details for Bug 1683798 – pacman-Fix-loop-when-downloading-packages

[patch] pacman-Fix-loop-when-downloading-packages

0002-pacman-Fix-loop-when-downloading-packages.patch (text/plain), 2.88 KB, created by Toolybird on 2020-05-24 07:53:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toolybird

Created: 2020-05-24 07:53:27 UTC

Size: 2.88 KB

patch

obsolete

>From 722a336385da543a5f5698fd21ad8a366b7a39a1 Mon Sep 17 00:00:00 2001
>From: Geoff Toole <toolybird@tuta.io>
>Date: Sun, 24 May 2020 12:27:28 +1000
>Subject: [PATCH 2/2] pacman: Fix loop when downloading packages
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Patch from Arch Linux Team Members Johannes LÃ¶thberg and Robin Broda.
>Package downloads are attempted multiple times unnecessarily. Shift
>loop into the correct position.
>---
> src/ph_pacman.ml | 46 +++++++++++++++++++++++-----------------------
> 1 file changed, 23 insertions(+), 23 deletions(-)
>
>diff --git a/src/ph_pacman.ml b/src/ph_pacman.ml
>index eb20650..b3effca 100644
>--- a/src/ph_pacman.ml
>+++ b/src/ph_pacman.ml
>@@ -173,25 +173,25 @@ let pacman_download_all_packages pkgs dir =
>    *
>    * CacheDir directives must be filtered out to force pacman downloads.
>    *)
>-  List.iter (
>-    fun name ->
>-      let cmd = sprintf "\
>-        set -e
>-        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 -> " --config tmp.conf --dbpath var/lib/pacman"
>-         | Some filename -> " --config " ^ (quote filename))
>-        (quoted_list names) in
>-      if !settings.debug >= 2 then printf "%s" cmd;
>-      if Sys.command cmd <> 0 then (
>-        (* The package may not be in the main repos, check the AUR. *)
>+  let cmd = sprintf "\
>+    set -e
>+    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 -> " --config tmp.conf --dbpath var/lib/pacman"
>+     | Some filename -> " --config " ^ (quote filename))
>+    (quoted_list names) in
>+  if !settings.debug >= 2 then printf "%s" cmd;
>+  if Sys.command cmd <> 0 then (
>+    (* The package may not be in the main repos, check the AUR. *)
>+    List.iter (
>+      fun name ->
>         let cmd = sprintf "\
>           set -e
>           umask 0000
>@@ -204,16 +204,16 @@ let pacman_download_all_packages pkgs dir =
>        "
>           (quote tdir)
>           (quote ("https://aur.archlinux.org/packages/" ^
>-	          (String.sub name 0 2) ^
>-	          "/" ^ name ^ "/" ^ name ^ ".tar.gz"))
>+	    (String.sub name 0 2) ^
>+	    "/" ^ name ^ "/" ^ name ^ ".tar.gz"))
>           (quote (name ^ ".tar.gz"))
>           (quote name) (* cd *)
>           Config.makepkg
>           (quote name) (quote tdir) (* mv *) in
>         if !settings.debug >= 2 then printf "%s" cmd;
>         run_command cmd
>-      );
>-  ) names;
>+    ) names;
>+  );
> 
>   (* Unpack the downloaded packages. *)
>   let cmd =
>-- 
>2.26.2
>

Actions: View | Diff

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