fix for syntax error

Setting tag NodeManager-1.8-18

--This line, and those below, will be ignored--
Please write a changelog for this new tag in the section above
DIFF=========
Index: tools.py
===================================================================
--- tools.py	(.../tags/NodeManager-1.8-17)	(révision 15402)
+++ tools.py	(.../trunk)	(révision 15402)
@@ -18,18 +18,21 @@
     return interface

 def get_hwaddr_from_plnode():
-    for line in open("/usr/boot/plnode.txt", 'r').readlines():
-        if line.startswith("NET_DEVICE"):
-            return line.split("=")[1].strip().strip('"')
+    try:
+        for line in open("/usr/boot/plnode.txt", 'r').readlines():
+            if line.startswith("NET_DEVICE"):
+                return line.split("=")[1].strip().strip('"')
+    except:
+        pass
     return None

 def get_if_from_hwaddr(hwaddr):
-   import sioc
-   devs = sioc.gifconf()
-   for dev in devs:
-      dev_hwaddr = sioc.gifhwaddr(dev)
-      if dev_hwaddr == hwaddr: return dev
-   return None
+    import sioc
+    devs = sioc.gifconf()
+    for dev in devs:
+        dev_hwaddr = sioc.gifhwaddr(dev)
+        if dev_hwaddr == hwaddr: return dev
+    return None

 def as_daemon_thread(run):
     """Call function <run> with no arguments in its own thread."""
Index: bwmon.py
===================================================================
--- bwmon.py	(.../tags/NodeManager-1.8-17)	(révision 15402)
+++ bwmon.py	(.../trunk)	(révision 15402)
@@ -324,7 +324,7 @@
                   (self.name,
                    bwlimit.format_tc_rate(maxrate),
                    bwlimit.format_tc_rate(maxi2rate)), 1)
-            bwlimit.set(xid = self.xid, dev = dev_default
+            bwlimit.set(xid = self.xid, dev = dev_default,
                 minrate = self.MinRate * 1000,
                 maxrate = self.MaxRate * 1000,
                 maxexemptrate = self.Maxi2Rate * 1000,

diff --git a/NodeManager.spec b/NodeManager.spec
index b7192aa..e61387e 100644 (file)
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@ -7,7 +7,7 @@
 
 %define name NodeManager
 %define version 1.8
-%define taglevel 17
+%define taglevel 18
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/logrotate.d/nm
 
 %changelog
+* Thu Oct 22 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - NodeManager-1.8-18
+- fix for syntax error
+
 * Wed Oct 21 2009 anil vengalil <avengali@sophia.inria.fr> - NodeManager-1.8-17
 - -fixed problem with sioc import at the build side
 - -bwlimit.set() now accepts the device and does not asume that it is eth0