Merge branch 'cliff'

3c012add · Marco Mariani · 32ea1e9e · 79739eb9 · 3c012add
Commit 3c012add authored Jun 17, 2013 by Marco Mariani
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

slapos/format.py slapos/format.py +1 -2

No files found.
--- a/slapos/format.py
+++ b/slapos/format.py
@@ -695,8 +695,7 @@ class Interface(object):
    _, result = callAndRead(['ip', 'addr', 'list', self.name])
    self.attach_to_tap = 'DOWN' in result.split('\n', 1)[0]
-  def __getinitargs__(self):
+  # XXX no __getinitargs__, as instances of this class are never deserialized.
-    return (self.name,)
  def getIPv4LocalAddressList(self):
    """