Resolve merge conflicts.

1 files changed, 3 insertions, 16 deletions

diff --git a/scripts/rhodecode-setup b/scripts/rhodecode-setup
index 756e005..9e983c8 100755
--- a/scripts/rhodecode-setup
+++ b/scripts/rhodecode-setup
@@ -250,32 +250,19 @@ def execute_command(cmd_args,
     if input_str:
         process = subprocess.Popen(cmd_args,
                                    cwd=work_dir,
-<<<<<<< HEAD
-                                   stderr=stderr,
-                                   stdin=stdin,
-                                   stdout=stdout)
+                                   stdin=subprocess.PIPE)
         p_out, p_err = process.communicate(input=input_str)
         return p_out, p_err
+
     else:
         process = subprocess.Popen(cmd_args,
-                                   cwd=work_dir,
-                                   stderr=stderr,
-                                   stdout=stdout)
+                                   cwd=work_dir)
         p_out, p_err = process.communicate()
         return p_out, p_err
-    if process.returncode != 0:
-=======
-                                   stdin=subprocess.PIPE)
-        process.communicate(input=input_str)
-    else:
-        process = subprocess.Popen(cmd_args,
-                                   cwd=work_dir)
-        process.communicate()
 
     if continue_on_error:
         return
     elif process.returncode != 0:
->>>>>>> milo
         print "Error executing the following command: %s" % " ".join(cmd_args)
         sys.exit(1)