# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1378893398 -7200
# Node ID 73dbd282ad3abd4b8997fc4935330e56000b87e2
# Parent  ceecc37b44d795d7b1a7c0d60605b5d3682ae32e# Parent  72379668554638d9d00cad14d34fbcf41d919fb5
Merge.

diff -r ceecc37b44d7 -r 73dbd282ad3a mxtool/mx.py
--- a/mxtool/mx.py	Wed Sep 11 09:37:39 2013 +0200
+++ b/mxtool/mx.py	Wed Sep 11 11:56:38 2013 +0200
@@ -2558,12 +2558,14 @@
 
     # identify the location where to look for workingsets.xml
     wsfilename = 'workingsets.xml'
+    wsloc = '.metadata/.plugins/org.eclipse.ui.workbench'
     wsroot = suite.dir
     if os.environ.has_key('WORKSPACE'):
         wsroot = os.environ['WORKSPACE']
-    wsdir = join(wsroot, '.metadata/.plugins/org.eclipse.ui.workbench')
+    wsdir = join(wsroot, wsloc)
     if not exists(wsdir):
         wsdir = wsroot
+        log('Could not find Eclipse metadata directory. Please place ' + wsfilename + ' in ' + wsloc + ' manually.')
     wspath = join(wsdir, wsfilename)
 
     # gather working set info from project data