Andrew Geissler | 0903674 | 2021-06-25 14:25:14 -0500 | [diff] [blame^] | 1 | From 393ac20efc66bfc000a2457e093e369b934c5a50 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Thu, 21 May 2020 20:13:25 +0000 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4 | Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our |
| 5 | dpkg callings" |
| 6 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 7 | This reverts commit a2a75ff4516f7609f4c55b42270abb8d08943c60, which |
| 8 | always run 'dpkg --configure -a' at the end of our dpkg callings, |
| 9 | but it does not work for cross-compile, since the rootfs dir can not |
| 10 | be passed into dpkg, and lead to the below similar error: |
| 11 | ------- |
| 12 | |mkdir: cannot create directory '/usr/lib/opkg': Permission denied |
| 13 | ------- |
| 14 | |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 15 | Upstream-Status: Inappropriate [embedded specific] |
| 16 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 17 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 18 | --- |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 19 | apt-pkg/deb/dpkgpm.cc | 9 ++------- |
| 20 | 1 file changed, 2 insertions(+), 7 deletions(-) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 21 | |
| 22 | diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 23 | index 46a6dee..8617a9e 100644 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 24 | --- a/apt-pkg/deb/dpkgpm.cc |
| 25 | +++ b/apt-pkg/deb/dpkgpm.cc |
Andrew Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 26 | @@ -1211,12 +1211,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 27 | } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 28 | } |
| 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 Geissler | 95ac1b8 | 2021-03-31 14:34:31 -0500 | [diff] [blame] | 38 | void pkgDPkgPM::StartPtyMagic() /*{{{*/ |
| 39 | @@ -1710,7 +1704,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 40 | |
Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 41 | // 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 Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 48 | bool const TriggersPending = _config->FindB("DPkg::TriggersPending", false); |