From 30155313812d97c8daf59faa7f68d5639f9d06ad Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 4 Oct 2008 21:32:29 +0000 Subject: Handle AttributeError in case os.getloadavg does not exist, like when python is built agains uclibc. svn path=/main/trunk/; revision=11621 --- pym/_emerge/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 96f3c2aa9..60940e82c 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8395,7 +8395,7 @@ class PollScheduler(object): self._running_job_count() > 1: try: avg1, avg5, avg15 = os.getloadavg() - except OSError, e: + except (AttributeError, OSError), e: writemsg("!!! getloadavg() failed: %s\n" % (e,), noiselevel=-1) del e @@ -8778,7 +8778,7 @@ class JobStatusDisplay(object): def _load_avg_str(self): try: avg = os.getloadavg() - except OSError, e: + except (AttributeError, OSError), e: return str(e) max_avg = max(avg) -- cgit v1.2.3-1-g7c22