merge from improvements on the 1.0 branch:

[monitor.git] / showlatlon.py

diff --git a/showlatlon.py b/showlatlon.py
index a556953..951802a 100755 (executable)
--- a/showlatlon.py
+++ b/showlatlon.py
@@ -9,7 +9,7 @@ from datetime import datetime, timedelta
 
 import database
 import comon
-from nodecommon import color_pcu_state, datetime_fromstr
+from monitor.common import color_pcu_state, datetime_fromstr
 from nodehistory import get_filefromglob
 import time
 import traceback
@@ -83,8 +83,8 @@ def main():
                begin = time.strftime(format)
 
        d = datetime_fromstr(begin)
-       fbstr = get_filefromglob(d, "production.findbad")
-       fbpcustr = get_filefromglob(d, "production.findbadpcus")
+       fbstr = get_filefromglob(d, "production.findbad")[0]
+       fbpcustr = get_filefromglob(d, "production.findbadpcus")[0]
 
        l_plcnodes = plccache.l_nodes
        l_plcsites = plccache.l_sites