supermin/0002-utils-remove-unused-run_python-function.patch
Richard W.M. Jones 5c44b1ee43 Add all upstream patches since 5.1.15 was released.
- These should improve boot performance and initrd size.
2016-03-18 13:17:56 +00:00

52 lines
1.6 KiB
Diff

From d72b268bba4730d676b504f6ff23c873833c50ab Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 18 Feb 2016 14:31:44 +0100
Subject: [PATCH 2/9] utils: remove unused run_python function
No more used since the supermin 5 rewrite; RPM code either directly
invoked rpm(1), or now uses librpm.
---
src/utils.ml | 9 ---------
src/utils.mli | 5 -----
2 files changed, 14 deletions(-)
diff --git a/src/utils.ml b/src/utils.ml
index 7ae24bd..87c9cf7 100644
--- a/src/utils.ml
+++ b/src/utils.ml
@@ -85,15 +85,6 @@ let run_shell code args =
exit 1
)
-let run_python code args =
- let cmd = sprintf "python -c %s %s"
- (Filename.quote code)
- (String.concat " " (List.map Filename.quote args)) in
- if Sys.command cmd <> 0 then (
- eprintf "supermin: external python program failed, see earlier error messages\n";
- exit 1
- )
-
let rec find s sub =
let len = String.length s in
let sublen = String.length sub in
diff --git a/src/utils.mli b/src/utils.mli
index 7896e34..1a7687a 100644
--- a/src/utils.mli
+++ b/src/utils.mli
@@ -49,11 +49,6 @@ val run_shell : string -> string list -> unit
This does not return anything, but exits with an error message
if the shell code returns an error. *)
-val run_python : string -> string list -> unit
- (** [run_python code args] runs Python [code] with arguments [args].
- This does not return anything, but exits with an error message
- if the Python code returns an error. *)
-
val (//) : string -> string -> string
(** [x // y] concatenates file paths [x] and [y] into a single path. *)
--
2.5.0