summaryrefslogtreecommitdiff
path: root/morphlib/workspace.py
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-07-31 12:03:40 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-07-31 16:05:19 +0000
commit0f77afae8b89d3ef57053562d37364c118d9e519 (patch)
tree3c4aabf4b992d22afd4c8d521a403409d716b435 /morphlib/workspace.py
parent339c05186f49d0203618b5979cf4e76d6d1fc3e6 (diff)
downloadmorph-0f77afae8b89d3ef57053562d37364c118d9e519.tar.gz
Re-implement "morph workspace" using the Workspace class
Put new implementation into new branch and merge plugin, and remove old implementation from the old plugin. Also change the error message for the NotInWorkspace exception, so that it matches what the test suite expects. It's a crappy error message, I think, but I don't want to change external behaviour during refactoring.
Diffstat (limited to 'morphlib/workspace.py')
-rw-r--r--morphlib/workspace.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/morphlib/workspace.py b/morphlib/workspace.py
index 5a2eb86b..3a2269c8 100644
--- a/morphlib/workspace.py
+++ b/morphlib/workspace.py
@@ -35,7 +35,10 @@ class WorkspaceDirExists(morphlib.Error):
class NotInWorkspace(morphlib.Error):
def __init__(self, dirname):
- self.msg = 'Directory %s is not in a workspace' % dirname
+ self.msg = (
+ "Can't find the workspace directory.\n"
+ "Morph must be built and deployed within the "
+ "system branch checkout within the workspace directory.")
class Workspace(object):