summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch')
-rw-r--r--meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
index 37f969690c..6f4d5b6e72 100644
--- a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
+++ b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch
@@ -1,4 +1,4 @@
1From 34700bebc52659e7e3eecd252f65bd36e669eee8 Mon Sep 17 00:00:00 2001 1From a2dd661484536492b47d4c88998f2bf516749bc8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 21 May 2020 20:13:25 +0000 3Date: Thu, 21 May 2020 20:13:25 +0000
4Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our 4Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our
@@ -20,10 +20,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
20 1 file changed, 2 insertions(+), 7 deletions(-) 20 1 file changed, 2 insertions(+), 7 deletions(-)
21 21
22diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc 22diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
23index ffa880d..5875e86 100644 23index 93effa959..4375781d1 100644
24--- a/apt-pkg/deb/dpkgpm.cc 24--- a/apt-pkg/deb/dpkgpm.cc
25+++ b/apt-pkg/deb/dpkgpm.cc 25+++ b/apt-pkg/deb/dpkgpm.cc
26@@ -1215,12 +1215,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() 26@@ -1199,12 +1199,6 @@ void pkgDPkgPM::BuildPackagesProgressMap()
27 } 27 }
28 } 28 }
29 } 29 }
@@ -35,8 +35,8 @@ index ffa880d..5875e86 100644
35- ++PackagesTotal; 35- ++PackagesTotal;
36 } 36 }
37 /*}}}*/ 37 /*}}}*/
38 bool pkgDPkgPM::Go(int StatusFd) /*{{{*/ 38 void pkgDPkgPM::StartPtyMagic() /*{{{*/
39@@ -1716,7 +1710,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) 39@@ -1741,7 +1735,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
40 40
41 // support subpressing of triggers processing for special 41 // support subpressing of triggers processing for special
42 // cases like d-i that runs the triggers handling manually 42 // cases like d-i that runs the triggers handling manually