diff options
| author | David Cantrell <dcantrell@redhat.com> | 2007-03-27 21:23:50 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2007-03-27 21:23:50 +0000 |
| commit | e76920a9cdc35018c693c24c684cba81dfa4cafa (patch) | |
| tree | 0623dcbf1eff71b7efa29b77a8695553ed7270b3 /network.py | |
| parent | 487dca5284caa220a9647bb80780921a37583d2b (diff) | |
| download | anaconda-e76920a9cdc35018c693c24c684cba81dfa4cafa.tar.gz anaconda-e76920a9cdc35018c693c24c684cba81dfa4cafa.tar.xz anaconda-e76920a9cdc35018c693c24c684cba81dfa4cafa.zip | |
* gui.py (releaseNotesButtonClicked): Spaces vs. tabs, tonight at 11.
* network.py (hasActiveDev): Use isys.getLinkStatus() rather than
isys.getIPAddress() (#232512).
* isys/isys.c (doGetIPAddress): Do not clear netlink cache.
* isys/nl.c: Netlink cache searching cleanups.
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/network.py b/network.py index 6e10dd754..a3704bb36 100644 --- a/network.py +++ b/network.py @@ -106,15 +106,8 @@ def hasActiveNetDev(): # try to load /tmp/netinfo and see if we can sniff out network info netinfo = Network() for dev in netinfo.netdevices.keys(): - try: - ip = isys.getIPAddress(dev) - except Exception, e: - log.error("Got an exception trying to get the ip addr of %s: " - "%s" %(dev, e)) - continue - if ip == '127.0.0.1' or ip is None: - continue - return True + if isys.getLinkStatus(dev): + return True return False class NetworkDevice(SimpleConfigFile): |