--- a/AbstractSourceCodeManager.st	Fri Feb 01 23:46:31 2019 +0000
+++ b/AbstractSourceCodeManager.st	Tue Jun 02 12:14:16 2020 +0100
@@ -1,6 +1,7 @@
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
  COPYRIGHT (c) 2015-2016 Jan Vrany
+ COPYRIGHT (c) 2020 LabWare
               All Rights Reserved
 
  This software is furnished under a license and may be used
@@ -16,11 +17,11 @@
 
 Object subclass:#AbstractSourceCodeManager
 	instanceVariableNames:''
-	classVariableNames:'CacheDirectoryName CachingSources DefaultManager ManagerPerModule
-		UseWorkTree Verbose WorkTreeDirectoryName
-                PackagesWithoutExtensionMethodConfirmation		
-                SuppressExtensionMethodConfirmation
-                ManagerForPackageCache'               
+	classVariableNames:'CacheDirectoryName CachingSources DefaultManager
+		ManagerForPackageCache ManagerPerModule
+		PackagesWithoutExtensionMethodConfirmation
+		SuppressExtensionMethodConfirmation UseWorkTree Verbose
+		WorkTreeDirectoryName'
 	poolDictionaries:''
 	category:'System-SourceCodeManagement'
 !
@@ -38,6 +39,7 @@
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
  COPYRIGHT (c) 2015-2016 Jan Vrany
+ COPYRIGHT (c) 2020 LabWare
               All Rights Reserved
 
  This software is furnished under a license and may be used
@@ -320,20 +322,24 @@
     "Still no luck, try to auto-configure."
     prjdef notNil ifTrue:[
         prjdir := prjdef packageDirectory.
-        (prjdir notNil and:[prjdir isDirectory]) ifTrue:[
-            | managers |
-            managers := self availableManagers select:[:mgr |
-                mgr enabled
-                    and:[(mgr isResponsibleForPackage: prjsym)
-                    and:[mgr validateWorkingCopy: prjdir] ] .    
-            ].
-            managers size == 1 ifTrue:[
-                manager := managers anElement.
-                ManagerForPackageCache at: prjsym put: manager.
-                ^manager
-            ]
+    ] ifFalse:[ 
+        prjdir := aSymbol asPackageId packageDirectory 
+    ].
+
+    (prjdir notNil and:[prjdir isDirectory]) ifTrue:[
+        | managers |
+        managers := self availableManagers select:[:mgr |
+            mgr enabled
+                and:[(mgr isResponsibleForPackage: prjsym)
+                and:[mgr validateWorkingCopy: prjdir] ] .    
         ].
+        managers size == 1 ifTrue:[
+            manager := managers anElement.
+            ManagerForPackageCache at: prjsym put: manager.
+            ^manager
+        ]
     ].
+
     parentPrjId := prjsym asPackageId parentPackage.
     parentPrjId notNil ifTrue:[ 
         ^ self managerForPackage: parentPrjId asSymbol  
@@ -351,6 +357,7 @@
     "Modified: / 19-10-2011 / 16:45:38 / cg"
     "Modified: / 02-10-2015 / 10:24:41 / jv"
     "Modified: / 04-03-2016 / 15:33:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 02-06-2020 / 12:12:40 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 managerPerMatchingModuleDefinitions