[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH 1/2] use apt-get instead of aptitude



---
 config.ml.in          |    2 +-
 configure.ac          |    2 +-
 febootstrap_debian.ml |    8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.ml.in b/config.ml.in
index a8c008a..262c913 100644
--- a/config.ml.in
+++ b/config.ml.in
@@ -22,7 +22,7 @@ let package_version = "@PACKAGE_VERSION@"
 let yum = "@YUM@"
 let rpm = "@RPM@"
 let yumdownloader = "@YUMDOWNLOADER@"
-let aptitude = "@APTITUDE@"
+let apt_get = "@APTGET@"
 let dpkg = "@DPKG@"
 let pacman = "@PACMAN@"
 let host_cpu = "@host_cpu@"
diff --git a/configure.ac b/configure.ac
index bd9d39d..1a0302c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_CHECK_PROG(RPM,[rpm],[rpm],[no])
 AC_CHECK_PROG(YUMDOWNLOADER,[yumdownloader],[yumdownloader],[no])
 
 dnl For Debian handler.
-AC_CHECK_PROG(APTITUDE,[aptitude],[aptitude],[no])
+AC_CHECK_PROG(APTGET,[apt-get],[apt-get],[no])
 AC_CHECK_PROG(DPKG,[dpkg],[dpkg],[no])
 
 dnl For ArchLinux handler.
diff --git a/febootstrap_debian.ml b/febootstrap_debian.ml
index f0d0be5..745a383 100644
--- a/febootstrap_debian.ml
+++ b/febootstrap_debian.ml
@@ -30,7 +30,7 @@ let tmpdir = tmpdir ()
 
 let debian_detect () =
   file_exists "/etc/debian_version" &&
-    Config.aptitude <> "no" && Config.dpkg <> "no"
+    Config.apt_get <> "no" && Config.dpkg <> "no"
 
 let debian_resolve_dependencies_and_download names =
   let cmd =
@@ -47,12 +47,12 @@ let debian_resolve_dependencies_and_download names =
 
   (* Download the packages. *)
   let cmd =
-    sprintf "cd %s && aptitude download %s"
+    sprintf "cd %s && apt-get download %s"
       (Filename.quote tmpdir)
       (String.concat " " (List.map Filename.quote pkgs)) in
   run_command cmd;
 
-  (* Find out what aptitude downloaded. *)
+  (* Find out what apt-get downloaded. *)
   let files = Sys.readdir tmpdir in
 
   let pkgs = List.map (
@@ -68,7 +68,7 @@ let debian_resolve_dependencies_and_download names =
 	    raise Exit
 	  )
 	done;
-	eprintf "febootstrap: aptitude: error: no file was downloaded corresponding to package %s\n" pkg;
+	eprintf "febootstrap: apt-get: error: no file was downloaded corresponding to package %s\n" pkg;
 	exit 1
       with
 	  Exit -> !r
-- 
1.7.5.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]