Attachment 9177 Details for Bug 20620 – Patch to fix fast path in do_pkgs::ensure_is_installed()

Patch to fix fast path in do_pkgs::ensure_is_installed()

0004-Fix-fast-path-for-do_pkgs-ensure_is_installed.patch (text/plain), 762 bytes, created by Martin Whitaker on 2017-04-02 22:34:26 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2017-04-02 22:34:26 CEST

Size: 762 bytes

patch

obsolete

From 44011ce2f4b44ef0a82898b1f8a225110cf77921 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 2 Apr 2017 12:24:48 +0100
Subject: [PATCH 4/4] Fix fast path for do_pkgs::ensure_is_installed().

The refactoring in commit de1fcc27f943f4ae7b8ac4147a36b196c236619e
failed to pass $o_file down to is_installed().

diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm
index e4b9b01..1715ac1 100644
--- a/perl-install/do_pkgs.pm
+++ b/perl-install/do_pkgs.pm
@@ -38,7 +38,7 @@ If $b_auto is set, (g)urpmi will not ask any questions.
 sub ensure_is_installed {
     my ($do, $pkg, $o_file, $b_auto) = @_;
 
-    if ($do->is_installed($pkg)) {
+    if ($do->is_installed($pkg, $o_file)) {
 	return 1;
     }
 
-- 
2.10.2

Actions: View

Attachments on bug 20620: 9174 | 9175 | 9176 | 9177 | 9182