X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Ffebootstrap_pacman.ml;h=7fbb72b5a958ebf1cfe09328d719e1ac5a53b5bc;hb=HEAD;hp=6691ebe9a185891da6c7017a73f1b3d5de1df442;hpb=1d6f1a9cb0fb1be8467d8e2c0fbda1b7eca70c66;p=febootstrap.git

diff --git a/src/febootstrap_pacman.ml b/src/febootstrap_pacman.ml
index 6691ebe..7fbb72b 100644
--- a/src/febootstrap_pacman.ml
+++ b/src/febootstrap_pacman.ml
@@ -32,9 +32,13 @@ let pacman_detect () =
   file_exists "/etc/arch-release" &&
     Config.pacman <> "no"
 
+let pacman_init () =
+  if use_installed then
+    failwith "pacman driver doesn't support --use-installed"
+
 let pacman_resolve_dependencies_and_download names =
   let cmd =
-    sprintf "pactree -u %s | sort -u"
+    sprintf "(for p in %s; do pactree -u $p; done) | awk '{print $1}' | sort -u"
       (String.concat " " (List.map Filename.quote names)) in
   let pkgs = run_command_get_lines cmd in
 
@@ -80,13 +84,12 @@ let pacman_list_files pkg =
   let pkgdir = tmpdir // pkg ^ ".d" in
   mkdir pkgdir 0o755;
   let cmd =
-    sprintf "pacman -Q %s | awk '{print $2}'"
-      pkg in
-   let ver = List.hd (run_command_get_lines cmd) in
-   let cmd =
-     sprintf "umask 0000; fakeroot tar -xf %s-%s* -C %s"
-     (Filename.quote tmpdir // pkg ) ver (Filename.quote pkgdir) in
-   run_command cmd;
+    sprintf "ls -1 %s/%s-*.pkg.* | awk '/\\/%s-[^/-]*-[^/-]*-[^/-]*$/ { print $0 }'"
+      tmpdir pkg pkg in
+  let pkgfile = List.hd (run_command_get_lines cmd) in
+    let cmd = sprintf "umask 0000; fakeroot tar -xf %s -C %s"
+              (Filename.quote pkgfile) (Filename.quote pkgdir) in
+  run_command cmd;
 
   let cmd = sprintf "cd %s && find ." pkgdir in
   let lines = run_command_get_lines cmd in
@@ -123,6 +126,7 @@ let pacman_get_file_from_package pkg file =
 let () =
   let ph = {
     ph_detect = pacman_detect;
+    ph_init = pacman_init;
     ph_resolve_dependencies_and_download =
       pacman_resolve_dependencies_and_download;
     ph_list_files = pacman_list_files;