|
|
| @@ -0,0 +1,46 @@
+--- py/lekatnet/plugins/rsh.py.orig 2010-01-19 21:45:48.000000000 +0100
++++ py/lekatnet/plugins/rsh.py 2010-01-19 21:45:57.000000000 +0100
+@@ -29,7 +29,7 @@
+ import time
+ import commands
+ import random
+-import md5
++import hashlib
+
+ class RSHRemoteCommand(RemoteCommand):
+ "RSH remote execution class"
+--- py/lekatnet/config.py.orig 2010-01-19 21:44:42.000000000 +0100
++++ py/lekatnet/config.py 2010-01-19 21:46:10.000000000 +0100
+@@ -1,4 +1,6 @@
+
++# $Id: config.py 279 2007-03-11 15:47:05Z stark $
++#
+ # Copyright (c) 2002-2007 Sebastian Stark
+ #
+ # Redistribution and use in source and binary forms, with or without
+@@ -52,14 +54,14 @@
+ import tempfile
+ import sys
+ import tpg
+-import popen2
++import subprocess
+
+ PARAMS = { 'ssh_path': "/usr/bin/ssh",
+ 'rsh_path': "/usr/bin/rsh",
+ 'method': "ssh",
+ 'maxparallel': "0",
+ 'user': pwd.getpwuid(os.geteuid())[0],
+- 'format': r"##### %d(stat: %s, dur(s): %t):\n%e%o\n"
++ 'format': r"### %d(stat: %s, dur(s): %t):\n%o\n"
+ }
+
+ METHODS = ['ssh', 'rsh']
+@@ -314,7 +316,7 @@
+ val = self._getGroup(group)[param]
+ if val == '': return self["settings"][param]
+ else: return val
+- except error.TNoSuchGroupError:
++ except KeyError:
+ return self["settings"][param]
+
+ def getGroupParams(self, groupName):
|
