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.patch24
1 files changed, 12 insertions, 12 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 b3a883bae8..734ba00d4f 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
@@ -22,10 +22,10 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
22 3 files changed, 11 insertions(+), 18 deletions(-) 22 3 files changed, 11 insertions(+), 18 deletions(-)
23 23
24diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc 24diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
25index 834cb0e..84ded3a 100644 25index 533d9b367..6ce81bbd9 100644
26--- a/apt-pkg/deb/dpkgpm.cc 26--- a/apt-pkg/deb/dpkgpm.cc
27+++ b/apt-pkg/deb/dpkgpm.cc 27+++ b/apt-pkg/deb/dpkgpm.cc
28@@ -1037,12 +1037,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() 28@@ -1041,12 +1041,6 @@ void pkgDPkgPM::BuildPackagesProgressMap()
29 PackagesTotal++; 29 PackagesTotal++;
30 } 30 }
31 } 31 }
@@ -38,7 +38,7 @@ index 834cb0e..84ded3a 100644
38 } 38 }
39 /*}}}*/ 39 /*}}}*/
40 bool pkgDPkgPM::Go(int StatusFd) 40 bool pkgDPkgPM::Go(int StatusFd)
41@@ -1250,8 +1244,9 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) 41@@ -1268,8 +1262,9 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
42 42
43 // support subpressing of triggers processing for special 43 // support subpressing of triggers processing for special
44 // cases like d-i that runs the triggers handling manually 44 // cases like d-i that runs the triggers handling manually
@@ -50,7 +50,7 @@ index 834cb0e..84ded3a 100644
50 50
51 // for the progress 51 // for the progress
52diff --git a/test/integration/test-apt-progress-fd-deb822 b/test/integration/test-apt-progress-fd-deb822 52diff --git a/test/integration/test-apt-progress-fd-deb822 b/test/integration/test-apt-progress-fd-deb822
53index 58fd732..3359762 100755 53index a8d59608d..0c6a9bbbf 100755
54--- a/test/integration/test-apt-progress-fd-deb822 54--- a/test/integration/test-apt-progress-fd-deb822
55+++ b/test/integration/test-apt-progress-fd-deb822 55+++ b/test/integration/test-apt-progress-fd-deb822
56@@ -27,36 +27,36 @@ Message: Installing testing (amd64) 56@@ -27,36 +27,36 @@ Message: Installing testing (amd64)
@@ -69,19 +69,19 @@ index 58fd732..3359762 100755
69 69
70 Status: progress 70 Status: progress
71 Package: testing:amd64 71 Package: testing:amd64
72-Percent: 50 72-Percent: 50.0000
73+Percent: 60 73+Percent: 60.0000
74 Message: Preparing to configure testing (amd64) 74 Message: Preparing to configure testing (amd64)
75 75
76 Status: progress 76 Status: progress
77-Percent: 50 77-Percent: 50.0000
78+Percent: 60 78+Percent: 60.0000
79 Message: Running dpkg 79 Message: Running dpkg
80 80
81 Status: progress 81 Status: progress
82 Package: testing:amd64 82 Package: testing:amd64
83-Percent: 50 83-Percent: 50.0000
84+Percent: 60 84+Percent: 60.0000
85 Message: Configuring testing (amd64) 85 Message: Configuring testing (amd64)
86 86
87 Status: progress 87 Status: progress
@@ -98,7 +98,7 @@ index 58fd732..3359762 100755
98 98
99 Status: progress 99 Status: progress
100diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts 100diff --git a/test/integration/test-no-fds-leaked-to-maintainer-scripts b/test/integration/test-no-fds-leaked-to-maintainer-scripts
101index d86e638..ef6d23b 100755 101index d86e638cd..ef6d23be2 100755
102--- a/test/integration/test-no-fds-leaked-to-maintainer-scripts 102--- a/test/integration/test-no-fds-leaked-to-maintainer-scripts
103+++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts 103+++ b/test/integration/test-no-fds-leaked-to-maintainer-scripts
104@@ -59,8 +59,7 @@ startup packages configure 104@@ -59,8 +59,7 @@ startup packages configure
@@ -122,5 +122,5 @@ index d86e638..ef6d23b 100755
122 checkpurge 122 checkpurge
123 123
124-- 124--
1252.1.4 1252.11.0
126 126