luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

restrict discarding session settings error message to direct load/reload. fixes #99

This commit is contained in:
Mark Harrah 2011-07-12 23:09:57 -04:00
parent 2d342d1485
commit f7cb85d36e
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/Main.scala
View File

@ -370,6 +370,7 @@ object BuiltinCommands
IO.createDirectory(base) IO.createDirectory(base)
val (eval, structure) = Load.defaultLoad(s, base, logger(s)) val (eval, structure) = Load.defaultLoad(s, base, logger(s))
val session = Load.initialSession(structure, eval) val session = Load.initialSession(structure, eval)
SessionSettings.checkSession(session, s)
Project.setProject(session, structure, s) Project.setProject(session, structure, s)
} }

1
main/Project.scala
View File

@ -140,7 +140,6 @@ object Project extends Init[Scope] with ProjectExtra
def setProject(session: SessionSettings, structure: BuildStructure, s: State): State = def setProject(session: SessionSettings, structure: BuildStructure, s: State): State =
{ {
SessionSettings.checkSession(session, s)
val previousOnUnload = orIdentity(s get Keys.onUnload.key) val previousOnUnload = orIdentity(s get Keys.onUnload.key)
val unloaded = previousOnUnload(s.runExitHooks()) val unloaded = previousOnUnload(s.runExitHooks())
val (onLoad, onUnload) = getHooks(structure.data) val (onLoad, onUnload) = getHooks(structure.data)