[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-276-g235a1d6

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 38bb34fad5d6ebda7234797259c4847e3a61b32e
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Jun 12 00:14:44 2011 +0200

    Singled out new file Debian.py from patches

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index b798341..3629c2c 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -117,56 +117,6 @@
 -sys.path.insert(0, os.path.join(TOP_BUILD_DIR, 'py'))
 +# Installation location set by configure
 +LIBEXEC_DIR = "@CONFIG_LIBEXECDIR@"
---- boinc-server-6.11.0+r18946.orig/py/Boinc/Debian.py
-+++ boinc-server-6.11.0+r18946/py/Boinc/Debian.py
-@@ -0,0 +1,47 @@
-+import time, sys, os
-+from subprocess import *
-+
-+_logfile = None
-+_prog = None
-+
-+def open_logfile():
-+    global _logfile, _prog
-+
-+    _logfile = open("/var/log/boinc.log", "a")
-+    _prog = os.path.basename(sys.argv[0])
-+
-+def logit(msg):
-+    global _logfile, _prog
-+
-+    timestamp = time.strftime("%Y-%m-%d %H:%M:%S")
-+    _logfile.write(timestamp + " " + _prog + " " + msg + "\n")
-+
-+def debug(msg):
-+    logit("Debug: " + msg)
-+
-+def notice(msg):
-+    logit("Notice: " + msg)
-+
-+def warning(msg):
-+    logit("Warning: " + msg)
-+
-+def error(msg):
-+    logit("Error: " + msg)
-+
-+def run_command(*args, **kwargs):
-+    debug("Running " + " ".join(args))
-+    try:
-+        cmd = Popen(args, stdout=PIPE, stderr=STDOUT, **kwargs)
-+    except OSError:
-+        error("Command not found")
-+        raise SystemExit("Failed to execute " + " ".join(args))
-+    result = cmd.communicate()[0]
-+    if result:
-+        debug("-- Begin command output --")
-+        for line in result.splitlines():
-+            debug(line)
-+        debug("-- End command output --")
-+    if cmd.returncode:
-+        error("Command exit code: " + str(cmd.returncode))
-+        raise SystemExit("Failed to execute " + " ".join(args))
-+
 --- boinc-server-6.11.0+r18946.orig/py/Boinc/tools.py
 +++ boinc-server-6.11.0+r18946/py/Boinc/tools.py
 @@ -81,17 +81,8 @@
diff --git a/debian/py/Boinc/Debian.py b/debian/py/Boinc/Debian.py
new file mode 100644
index 0000000..e087631
--- /dev/null
+++ b/debian/py/Boinc/Debian.py
@@ -0,0 +1,47 @@
+import time, sys, os
+from subprocess import *
+
+_logfile = None
+_prog = None
+
+def open_logfile():
+    global _logfile, _prog
+
+    _logfile = open("/var/log/boinc.log", "a")
+    _prog = os.path.basename(sys.argv[0])
+
+def logit(msg):
+    global _logfile, _prog
+
+    timestamp = time.strftime("%Y-%m-%d %H:%M:%S")
+    _logfile.write(timestamp + " " + _prog + " " + msg + "\n")
+
+def debug(msg):
+    logit("Debug: " + msg)
+
+def notice(msg):
+    logit("Notice: " + msg)
+
+def warning(msg):
+    logit("Warning: " + msg)
+
+def error(msg):
+    logit("Error: " + msg)
+
+def run_command(*args, **kwargs):
+    debug("Running " + " ".join(args))
+    try:
+        cmd = Popen(args, stdout=PIPE, stderr=STDOUT, **kwargs)
+    except OSError:
+        error("Command not found")
+        raise SystemExit("Failed to execute " + " ".join(args))
+    result = cmd.communicate()[0]
+    if result:
+        debug("-- Begin command output --")
+        for line in result.splitlines():
+            debug(line)
+        debug("-- End command output --")
+    if cmd.returncode:
+        error("Command exit code: " + str(cmd.returncode))
+        raise SystemExit("Failed to execute " + " ".join(args))
+

-- 
BOINC packaging