From 2cfbabf92dbab4692beba3d675b923fb6a23526d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Thu, 22 Oct 2009 09:13:40 +0000 Subject: [PATCH] fix for syntax error MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 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, --- coblitz-tags.mk | 2 +- onelab-tags.mk | 2 +- planetlab-k27-tags.mk | 2 +- planetlab-tags.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coblitz-tags.mk b/coblitz-tags.mk index e21f562b..d5196529 100644 --- a/coblitz-tags.mk +++ b/coblitz-tags.mk @@ -12,7 +12,7 @@ libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-18 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-5 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-17 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-18 pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13 diff --git a/onelab-tags.mk b/onelab-tags.mk index 8f09fc14..db11f5e6 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -17,7 +17,7 @@ libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-18 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-5 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/trunk +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-18 pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index 77fe7fef..635eafbd 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -19,7 +19,7 @@ util-vserver-pl-SVNBRANCH := trellis util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/branches/trellis NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-5 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-17 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-18 # Trellis-specific NodeManager plugins NodeManager-topo-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-topo/trunk NodeManager-optin-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-optin/trunk diff --git a/planetlab-tags.mk b/planetlab-tags.mk index f6a579be..ad71a049 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -13,7 +13,7 @@ libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-18 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-5 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-17 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-18 pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13 -- 2.47.0