diff options
| author | Adam Conrad <adconrad@0c3.net> | 2013-01-18 01:09:43 -0700 |
|---|---|---|
| committer | Adam Conrad <adconrad@0c3.net> | 2013-01-18 01:09:43 -0700 |
| commit | 68225779d1337336707c33c0265fc537ae256813 (patch) | |
| tree | 6c4174f63b3014622f5b6132890846f5d47f1c29 /test/integration/test-bug-618848-always-respect-user-requests | |
| parent | 0dbd03a21542c03b0d9769787c8f794a697f3097 (diff) | |
* Merge from Debian unstable, pulling in new translations and fixes.
* Add linux-headers to /etc/kernel/postinst.d/apt-auto-removal guard.
* Catalan (Jordi Mallach)
* Drop a confusing non-breaking space. Closes: #691024
* Thai (Theppitak Karoonboonyanan). Closes: #691613
* Vietnamese (Trần Ngọc Quân). Closes: #693773
* Fix Plural forms in German, French, Japanese and Portuguese
translations. Thanks to Jakub Wilk for reporting these errors.
* apt-pkg/packagemanager.cc:
- do not do lock-step configuration for a M-A:same package if it isn't
unpacked yet in SmartConfigure and do not unpack a M-A:same package
again in SmartUnPack if we have already configured it (LP: #1062503)
* apt-pkg/depcache.cc:
- don't call MarkInstall with the FromUser flag set for packages
which are dependencies of APT::Never-MarkAuto-Sections matchers
- no mode changes should obviously be ok for pkgDepCache::IsModeChangeOk
* cmdline/apt-get.cc:
- do not call Mark{Install,Delete} from the autoremove code with
the FromUser bit set to avoid modifying the auto-installed bit
* apt-pkg/algorithms.cc:
- ensure pkgProblemResolver calls MarkDelete without FromUser set
so that it can't overrule holds and the protection flag
* change permissions of /var/log/apt/term.log to 0640 (LP: #975199)
* apt-pkg/algorithms.cc:
- fix package-pointer array memory leak in ResolveByKeepInternal()
* Portuguese (Américo Monteiro) (Closes: #686975)
* handle packages without a mandatory architecture (debian-policy §5.3)
by introducing a pseudo-architecture 'none' so that the small group of
users with these packages can get right of them without introducing too
much hassle for other users (Closes: #686346)
* merged the latest debian-sid fixes
Correct fi translation for hash sum mismatches (lp:420403)
Diffstat (limited to 'test/integration/test-bug-618848-always-respect-user-requests')
| -rwxr-xr-x | test/integration/test-bug-618848-always-respect-user-requests | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/test-bug-618848-always-respect-user-requests b/test/integration/test-bug-618848-always-respect-user-requests index 5148be640..1ebadf280 100755 --- a/test/integration/test-bug-618848-always-respect-user-requests +++ b/test/integration/test-bug-618848-always-respect-user-requests @@ -16,11 +16,11 @@ setupaptarchive testequal 'Reading package lists... Building dependency tree... MarkDelete libdb4.8 [ i386 ] < 1.0 > ( other ) FU=1 - MarkDelete exim4-daemon-light [ i386 ] < 1.0 > ( other ) FU=1 + MarkDelete exim4-daemon-light [ i386 ] < 1.0 > ( other ) FU=0 MarkInstall exim4-daemon-heavy [ i386 ] < none -> 1.0 > ( other ) FU=0 Ignore MarkInstall of libdb4.8 [ i386 ] < 1.0 > ( other ) as its mode (Delete) is protected MarkDelete exim4-daemon-heavy [ i386 ] < none -> 1.0 > ( other ) FU=0 - MarkDelete exim4 [ i386 ] < 1.0 > ( other ) FU=1 + MarkDelete exim4 [ i386 ] < 1.0 > ( other ) FU=0 The following packages will be REMOVED: exim4 exim4-daemon-light libdb4.8 MarkDelete exim4 [ i386 ] < 1.0 > ( other ) FU=1 |