Merge lp:~slimey/engage/bugfix into lp:engage

[Simon C]

Fix issue with lucid snmp libraries

Fix issue with lucid snmp libraries

[Simon C (slimey)]

review: Approve

[lp:~slimey/engage/bugfix]

7. By Simon C on 2012-10-05

Fix issue with lucid snmp libraries

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-02 12:19:57 +0000
+++ debian/changelog	2012-10-05 17:47:25 +0000
@@ -1,3 +1,9 @@
+engage (0.6.4) lucid; urgency=low
+
+  * Fix bug with lucid version of python snmp package
+
+ -- Simon C <[e-mail]>  Fri, 05 Oct 2012 18:39:34 +0100
+
 engage (0.6.3) precise; urgency=low
 
   * Bugfix for launchpad build and movie playing

=== modified file 'setup.py'
--- setup.py	2012-09-25 17:47:25 +0000
+++ setup.py	2012-10-05 17:47:25 +0000
@@ -7,7 +7,7 @@
 from distutils.core import setup
 
 setup(name='engage',
-      version="0.6.2",
+      version="0.6.4",
       description='EnGage: system/network statistics monitoring and Apple TV control',
       url='http://open.ensoft.co.uk/EnGage',
       packages=['engage', 'engage.collector', 'engage.media', 'engage.monitor', 

=== modified file 'src/engage/util/oid.py'
--- src/engage/util/oid.py	2012-09-18 21:21:43 +0000
+++ src/engage/util/oid.py	2012-10-05 17:47:25 +0000
@@ -50,7 +50,10 @@
         self.ifIndex2Name = {0: '??'}
         for name in self._walk(mib_table):
             ifName = name.val
-            ifIndex = int(name.tag.split('.')[-1])
+	    try:
+	        ifIndex = int(name.iid)
+	    except Exception:
+                ifIndex = int(name.tag.split('.')[-1])
             self.ifName2Index[ifName] = ifIndex
             self.ifIndex2Name[ifIndex] = ifName