misc fixes

Author: peakwinter

Diff for: genesis/plugins/sysconfig/main.py

@@ -64,16 +64,16 @@ def get_ui(self):
             bestat = 'Not installed'
         else:
             if self._mgr.get_status('beacon') == 'running':
-                lrstat = 'Running'
+                bestat = 'Running'
                 ui.find('flbeacon').append(UI.Button(text="Stop", id="svc/beacon/stop"))
             else:
-                lrstat = 'Not running'
+                bestat = 'Not running'
                 ui.find('flbeacon').append(UI.Button(text="Start", id="svc/beacon/start"))
             if self._mgr.get_enabled('beacon') == 'enabled':
-                lrstat += ' and enabled on boot'
+                bestat += ' and enabled on boot'
                 ui.find('flbeacon').append(UI.Button(text="Disable on boot", id="svc/beacon/disable"))
             else:
-                lrstat += ' and not enabled on boot'
+                bestat += ' and not enabled on boot'
                 ui.find('flbeacon').append(UI.Button(text="Enable on boot", id="svc/beacon/enable"))
         ui.find('logrunner').set('text', lrstat)
         ui.find('beacon').set('text', bestat)

Diff for: genesis/plugins/webapps/api.py

@@ -83,19 +83,21 @@ def get_sites(self):
 
             w.sclass = self.get_interface(w.stype)
             w.sinfo = self.get_info(w.stype)
-            w.dbengine = w.sinfo.dbengine
+            w.dbengine = w.sinfo.dbengine if hasattr(w.sinfo, 'dbengine') else None
             w.ssl_able = w.sinfo.ssl if hasattr(w.sinfo, 'ssl') else False
 
             applist.append(w)
         return applist
 
     def get_info(self, name):
-        return filter(lambda x: x.__class__.__name__ == name,
-            self.app.grab_plugins(apis.webapps.IWebapp))[0].plugin_info
+        cs = filter(lambda x: x.__class__.__name__ == name,
+            self.app.grab_plugins(apis.webapps.IWebapp))
+        return cs[0].plugin_info if len(cs) else None
 
     def get_interface(self, name):
-        return filter(lambda x: x.__class__.__name__ == name,
-            self.app.grab_plugins(apis.webapps.IWebapp))[0]
+        cs = filter(lambda x: x.__class__.__name__ == name,
+            self.app.grab_plugins(apis.webapps.IWebapp))
+        return cs[0] if len(cs) else None
 
     def cert_remove_notify(self, name, stype):
         # Called by webapp when removed.

Diff for: genesis/plugins/webapps/main.py

@@ -54,7 +54,7 @@ def on_init(self):
 					)
 					break
 		if not self._current:
-			self._current = self.apptypes[0]
+			self._current = self.apptypes[0] if len(self.apptypes) else None
 		for apptype in self.apptypes:
 			ok = False
 			for site in self.sites:
@@ -130,17 +130,18 @@ def get_main_ui(self):
 				)
 
 		info = self._current
-		if info.logo is True:
-			ui.find('logo').set('file', '/dl/'+self._current.id+'/logo.png')
-		ui.find('appname').set('text', info.name)
-		ui.find('short').set('text', info.desc)
-		if info.app_homepage is None:
-			ui.find('website').set('text', 'None')
-			ui.find('website').set('url', 'http://localhost')
-		else:
-			ui.find('website').set('text', info.app_homepage)
-			ui.find('website').set('url', info.app_homepage)
-		ui.find('desc').set('text', info.longdesc)
+		if info:
+			if info.logo is True:
+				ui.find('logo').set('file', '/dl/'+self._current.id+'/logo.png')
+			ui.find('appname').set('text', info.name)
+			ui.find('short').set('text', info.desc)
+			if info.app_homepage is None:
+				ui.find('website').set('text', 'None')
+				ui.find('website').set('url', 'http://localhost')
+			else:
+				ui.find('website').set('text', info.app_homepage)
+				ui.find('website').set('url', info.app_homepage)
+			ui.find('desc').set('text', info.longdesc)
 
 		if self._add is None:
 			ui.remove('dlgAdd')