[Reproducible-commits] [dpkg] 19/40: dpkg: Honor Conflicts/Breaks/Pre-Depends for packages in unpacked and half states
Jérémy Bobbio
lunar at moszumanska.debian.org
Sat May 30 09:52:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.
commit bf316c32edf2487d8b4b691ffb82fec368b92a2b
Author: Ian Jackson <iwj at ubuntu.com>
Date: Sat Apr 18 19:47:54 2015 +0200
dpkg: Honor Conflicts/Breaks/Pre-Depends for packages in unpacked and half states
Closes: #377860
Signed-off-by: Guillem Jover <guillem at debian.org>
---
debian/changelog | 2 ++
src/depcon.c | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ed22e9a..cd62e26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ dpkg (1.18.1) UNRELEASED; urgency=low
* Set the SE Linux file context even when the file mode has no file type.
* Make dpkg-buildpackage -j override any parallel option specified in
DEB_BUILD_OPTIONS. Regression introduced in dpkg 1.14.15.
+ * Honor Pre-Depends, Conflicts and Breaks for packages in unpacked and
+ half states. Thanks to Ian Jackson <iwj at ubuntu.com>. Closes: #377860
* Perl modules:
- Add missing strict and warnings pragmas for submodules.
- Use non-destructive substitutions inside map.
diff --git a/src/depcon.c b/src/depcon.c
index 1e73d29..a3cccb0 100644
--- a/src/depcon.c
+++ b/src/depcon.c
@@ -340,6 +340,11 @@ depisok(struct dependency *dep, struct varbuf *whynot,
case PKG_STAT_HALFCONFIGURED:
case PKG_STAT_UNPACKED:
case PKG_STAT_HALFINSTALLED:
+ if (dep->type == dep_predepends ||
+ dep->type == dep_conflicts ||
+ dep->type == dep_breaks)
+ break;
+ /* Fall through. */
case PKG_STAT_CONFIGFILES:
case PKG_STAT_NOTINSTALLED:
return true;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git
More information about the Reproducible-commits
mailing list