dstore makes a dojo build scan all packages twice

[jandppw]

When dstore is added to an existing build, I see that all packages are scanned twice.

processing profile resource /Users/jand/XXXXXXX/ui/build.profile.js
info(107) Package Version: package: dojo; version: 1.10.4
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/dojo/dojo/dojo.profile.js
info(107) Package Version: package: dijit; version: 1.10.4
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/dojo/dijit/dijit.profile.js
info(107) Package Version: package: dojox; version: 1.10.4
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/dojo/dojox/dojox.profile.js
info(107) Package Version: package: put-selector; version: 0.3.6
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/put-selector/package.js
info(107) Package Version: package: xstyle; version: 0.3.1
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/xstyle/package.js
info(107) Package Version: package: dstore; version: 1.0.1
processing profile resource /Users/jand/XXXXXXX/ui/build.profile.js
info(107) Package Version: package: dojo; version: 1.10.4
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/dojo/dojo/dojo.profile.js
info(107) Package Version: package: dijit; version: 1.10.4
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/dojo/dijit/dijit.profile.js
info(107) Package Version: package: dojox; version: 1.10.4
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/dojo/dojox/dojox.profile.js
info(107) Package Version: package: put-selector; version: 0.3.6
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/put-selector/package.js
info(107) Package Version: package: xstyle; version: 0.3.1
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/xstyle/package.js
info(107) Package Version: package: dstore; version: 1.0.1
processing profile resource /Users/jand/XXXXXXX/ui/src/lib/dstore/package.js

[...]

The packages are scanned in the order they are defined in build.profile.js, up until the package defined before dstore. Then, the scan starts again with build.profile.js, up until the package defined before dstore.

The dstore is scanned, and the packages defined after it. Then, those are scanned again.

I narrowed down the culprit to the code in package.js "determining optional package support in dstore". When I remove that for a test, all packages are scanned once, in order defined in build.profile.js.