[Libguestfs] [supermin 1/3] Recognize dpkg-divert

--- configure.ac | 1 + src/config.ml.in | 1 + src/dpkg.ml | 1 + 3 files changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 5a92034..f7e0402 100644 --- a/configure.ac +++ b/configure.ac @@ -92,6 +92,7 @@ AC_PATH_PROG(APT_GET,[apt-get],[no]) AC_PATH_PROG(DPKG,[dpkg],[no]) AC_PATH_PROG(DPKG_DEB,[dpkg-deb],[no]) AC_PATH_PROG(DPKG_QUERY,[dpkg-query],[no]) +AC_PATH_PROG(DPKG_DIVERT,[[dpkg-divert]],[no]) dnl For FrugalWare handler (currently disabled). AC_PATH_PROG(PACMAN_G2,[pacman-g2],[no]) diff --git a/src/config.ml.in b/src/config.ml.in index 5326bb0..acf2912 100644 --- a/src/config.ml.in +++ b/src/config.ml.in @@ -26,6 +26,7 @@ let cpio = "@CPIO@" let dpkg = "@DPKG@" let dpkg_deb = "@DPKG_DEB@" let dpkg_query = "@DPKG_QUERY@" +let dpkg_divert = "@DPKG_DIVERT@" let fakeroot = "@FAKEROOT@" let makepkg = "@MAKEPKG@" let pacman = "@PACMAN@" diff --git a/src/dpkg.ml b/src/dpkg.ml index 71aa12c..c28354a 100644 --- a/src/dpkg.ml +++ b/src/dpkg.ml @@ -26,6 +26,7 @@ let dpkg_detect () = Config.dpkg <> "no" && Config.dpkg_deb <> "no" && Config.dpkg_query <> "no" && + Config.dpkg_divert <> "no" && Config.apt_get <> "no" && file_exists "/etc/debian_version" -- 1.9.0