blob: 1517b478583e3023205d2d491a4b4796e14ad8e3 [file] [log] [blame]
Andrew Geissler09036742021-06-25 14:25:14 -05001From 393ac20efc66bfc000a2457e093e369b934c5a50 Mon Sep 17 00:00:00 2001
Andrew Geissler4ed12e12020-06-05 18:00:41 -05002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 21 May 2020 20:13:25 +0000
Patrick Williamsc124f4f2015-09-15 14:41:29 -05004Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our
5 dpkg callings"
6
Patrick Williamsc124f4f2015-09-15 14:41:29 -05007This reverts commit a2a75ff4516f7609f4c55b42270abb8d08943c60, which
8always run 'dpkg --configure -a' at the end of our dpkg callings,
9but it does not work for cross-compile, since the rootfs dir can not
10be passed into dpkg, and lead to the below similar error:
11 -------
12 |mkdir: cannot create directory '/usr/lib/opkg': Permission denied
13 -------
14
Andrew Geissler4ed12e12020-06-05 18:00:41 -050015Upstream-Status: Inappropriate [embedded specific]
16Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
17
Patrick Williamsc124f4f2015-09-15 14:41:29 -050018---
Andrew Geissler4ed12e12020-06-05 18:00:41 -050019 apt-pkg/deb/dpkgpm.cc | 9 ++-------
20 1 file changed, 2 insertions(+), 7 deletions(-)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050021
22diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
Andrew Geissler95ac1b82021-03-31 14:34:31 -050023index 46a6dee..8617a9e 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050024--- a/apt-pkg/deb/dpkgpm.cc
25+++ b/apt-pkg/deb/dpkgpm.cc
Andrew Geissler95ac1b82021-03-31 14:34:31 -050026@@ -1211,12 +1211,6 @@ void pkgDPkgPM::BuildPackagesProgressMap()
Andrew Geissler4ed12e12020-06-05 18:00:41 -050027 }
Patrick Williamsc124f4f2015-09-15 14:41:29 -050028 }
29 }
30- /* one extra: We don't want the progress bar to reach 100%, especially not
31- if we call dpkg --configure --pending and process a bunch of triggers
32- while showing 100%. Also, spindown takes a while, so never reaching 100%
33- is way more correct than reaching 100% while still doing stuff even if
34- doing it this way is slightly bending the rules */
35- ++PackagesTotal;
36 }
37 /*}}}*/
Andrew Geissler95ac1b82021-03-31 14:34:31 -050038 void pkgDPkgPM::StartPtyMagic() /*{{{*/
39@@ -1710,7 +1704,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050040
Andrew Geissler4ed12e12020-06-05 18:00:41 -050041 // support subpressing of triggers processing for special
42 // cases like d-i that runs the triggers handling manually
43- if (_config->FindB("DPkg::ConfigurePending", true))
44+ bool const SmartConf = (_config->Find("PackageManager::Configure", "all") != "all");
45+ if (0)
46 List.emplace_back(Item::ConfigurePending, pkgCache::PkgIterator());
47 }
Patrick Williamsc124f4f2015-09-15 14:41:29 -050048 bool const TriggersPending = _config->FindB("DPkg::TriggersPending", false);