From e14848ec1f88e1e79aade52fa4180d4a8d33db9e Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Fri, 23 Sep 2011 20:21:10 +0200
Subject: [PATCH] remove run* from cdist and put it into lib/exec

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist         | 49 ---------------------------------
 lib/cdist/exec.py | 70 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 49 deletions(-)
 create mode 100644 lib/cdist/exec.py

diff --git a/bin/cdist b/bin/cdist
index 137f701f..30fec278 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -106,55 +106,6 @@ class Cdist:
     def cleanup(self):
         self.path.cleanup()
 
-    def shell_run_or_debug_fail(self, script, *args, **kargs):
-        # Manually execute /bin/sh, because sh -e does what we want
-        # and sh -c -e does not exit if /bin/false called
-        args[0][:0] = [ "/bin/sh", "-e" ]
-
-        remote = False
-        if "remote" in kargs:
-            if kargs["remote"]:
-                args[0][:0] = self.remote_prefix
-                remote = true
-
-            del kargs["remote"]
-
-        log.debug("Shell exec cmd: %s", args)
-        log.debug("Shell exec env: %s", kargs['env'])
-        try:
-            subprocess.check_call(*args, **kargs)
-        except subprocess.CalledProcessError:
-            log.error("Code that raised the error:\n")
-            if remote:
-                remote_cat(script)
-            else:
-                try:
-                    script_fd = open(script)
-                    print(script_fd.read())
-                    script_fd.close()
-                except IOError as error:
-                    raise CdistError(str(error))
-
-            raise CdistError("Command failed (shell): " + " ".join(*args))
-        except OSError as error:
-            raise CdistError(" ".join(*args) + ": " + error.args[1])
-
-    def run_or_fail(self, *args, **kargs):
-        if "remote" in kargs:
-            if kargs["remote"]:
-                args[0][:0] = self.remote_prefix
-
-            del kargs["remote"]
-
-        log.debug("Exec: " + " ".join(*args))
-        try:
-            subprocess.check_call(*args, **kargs)
-        except subprocess.CalledProcessError:
-            raise CdistError("Command failed: " + " ".join(*args))
-        except OSError as error:
-            raise CdistError(" ".join(*args) + ": " + error.args[1])
-
-
     def remove_remote_dir(self, destination):
         self.run_or_fail(["rm", "-rf",  destination], remote=True)
 
diff --git a/lib/cdist/exec.py b/lib/cdist/exec.py
new file mode 100644
index 00000000..7a1421e0
--- /dev/null
+++ b/lib/cdist/exec.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+def shell_run_or_debug_fail(self, script, *args, **kargs):
+    # Manually execute /bin/sh, because sh -e does what we want
+    # and sh -c -e does not exit if /bin/false called
+    args[0][:0] = [ "/bin/sh", "-e" ]
+
+    remote = False
+    if "remote" in kargs:
+        if kargs["remote"]:
+            args[0][:0] = self.remote_prefix
+            remote = true
+
+        del kargs["remote"]
+
+    log.debug("Shell exec cmd: %s", args)
+    log.debug("Shell exec env: %s", kargs['env'])
+    try:
+        subprocess.check_call(*args, **kargs)
+    except subprocess.CalledProcessError:
+        log.error("Code that raised the error:\n")
+        if remote:
+            remote_cat(script)
+        else:
+            try:
+                script_fd = open(script)
+                print(script_fd.read())
+                script_fd.close()
+            except IOError as error:
+                raise CdistError(str(error))
+
+        raise CdistError("Command failed (shell): " + " ".join(*args))
+    except OSError as error:
+        raise CdistError(" ".join(*args) + ": " + error.args[1])
+
+
+def run_or_fail(self, *args, **kargs):
+    if "remote" in kargs:
+        if kargs["remote"]:
+            args[0][:0] = self.remote_prefix
+
+        del kargs["remote"]
+
+    log.debug("Exec: " + " ".join(*args))
+    try:
+        subprocess.check_call(*args, **kargs)
+    except subprocess.CalledProcessError:
+        raise CdistError("Command failed: " + " ".join(*args))
+    except OSError as error:
+        raise CdistError(" ".join(*args) + ": " + error.args[1])
+