raise specific exception for when buildroot is locked so we know not to orphankill. print filename in default logs.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/py-libs/backend.py b/src/py-libs/backend.py
index cc9c808..5968e31 100644
--- a/src/py-libs/backend.py
+++ b/src/py-libs/backend.py
@@ -145,7 +145,7 @@ class Root(object):
         try:
             fcntl.lockf(self.buildrootLock.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
         except IOError, e:
-            raise mock.exception.Error, "Build root is locked by another process."
+            raise mock.exception.BuildRootLocked, "Build root is locked by another process."
 
         # create our log files.
         self._resetLogging()
@@ -519,7 +519,7 @@ class Root(object):
         # attach logs to log files.
         # This happens in addition to anything
         # is set up in the config file... ie. logs go everywhere
-        formatter = logging.Formatter("%(asctime)s - %(module)s:%(lineno)d:%(levelname)s: %(message)s")
+        formatter = logging.Formatter("%(asctime)s - %(filename)s:%(lineno)d:%(levelname)s: %(message)s")
         for (log, filename) in (
                 (self._state_log, "state.log"),
                 (self.build_log, "build.log"),