From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 19 Mar 2014 10:30:03 +0000 (+0000)
Subject: Some fixes for latest upstream sexplib.
X-Git-Url: http://git.annexia.org/?p=rpmdepsize.git;a=commitdiff_plain;h=HEAD

Some fixes for latest upstream sexplib.
---

diff --git a/rpmdepsize.ml b/rpmdepsize.ml
index d0489bb..f48c0ef 100644
--- a/rpmdepsize.ml
+++ b/rpmdepsize.ml
@@ -19,8 +19,14 @@
  * Python script modified from a version by Seth Vidal.
  *)
 
+(* Rename the extlib Std module so it doesn't clash with the
+ * sexplib Std module.
+ *)
+module Extlib_Std = Std
+
 open Sexplib
-TYPE_CONV_PATH "."
+open Sexplib.Conv
+(*TYPE_CONV_PATH "."*)
 
 open ExtList
 open Unix
@@ -130,7 +136,7 @@ sys.stdout.write (\"))\")  # suppress trailing newline" in
   let chan = open_process_in cmd in
   ignore (input_line chan); (* Drop "Loaded plugins" line. *)
   let root, pkgs =
-    root_packages_of_sexp (Sexp.of_string (Std.input_all chan)) in
+    root_packages_of_sexp (Sexp.of_string (Extlib_Std.input_all chan)) in
   (match close_process_in chan with
    | WEXITED 0 -> ()
    | WEXITED i -> failwithf "python command exited with status %d" i