Skip to content

Commit

Permalink
v6.33.0. Improvement.
Browse files Browse the repository at this point in the history
- v6.33.0 May 6, 2013
	- We now load the exchange file based on which DocPad version we are
running
	- Updated dependencies
		- [Caterpillar Human](https://github.com/bevry/caterpillar-human)
v3.1 from v3.0
  • Loading branch information
balupton committed May 6, 2013
1 parent cf1a258 commit 210a2e4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
5 changes: 5 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## History

- v6.33.0 May 6, 2013
- We now load the exchange file based on which DocPad version we are running
- Updated dependencies
- [Caterpillar Human](https://github.com/bevry/caterpillar-human) v3.1 from v3.0

- v6.32.0 May 2, 2013
- Now uses [Caterpillar](https://github.com/bevry/caterpillar) v2
- We now write a `docpad-debug.log` file when running with the `-d` flag, submit this when you file a bug report :)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "docpad",
"version": "6.32.0",
"version": "6.33.0",
"description": "DocPad is a language agnostic document management system. This means you write your website as documents, in whatever language you wish, and DocPad will handle the compiling, templates and layouts for you. For static documents it will generate static files, for dynamic documents it'll re-render them on each request. You can utilise DocPad by itself, or use it as a module your own custom system. It's pretty cool, and well worth checking out. We love it.",
"homepage": "https://github.com/bevry/docpad",
"installUrl": "http://docpad.org/install",
Expand Down Expand Up @@ -75,7 +75,7 @@
"taskgroup": "~3.1.2",
"caterpillar": "~2.0.1",
"caterpillar-filter": "~2.0.1",
"caterpillar-human": "~2.0.2",
"caterpillar-human": "~2.1.0",
"commander": "~1.1.1",
"cson": "~1.4.1",
"express": "~3.2.0",
Expand Down
3 changes: 2 additions & 1 deletion src/lib/docpad.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -2358,7 +2358,8 @@ class DocPad extends EventEmitterEnhanced
return next(null,@exchange) unless typeChecker.isEmptyObject(@exchange)

# Otherwise fetch it from the exchangeUrl
@loadConfigUrl @config.exchangeUrl, (err,parsedData) ->
exchangeUrl = @config.exchangeUrl+'?version='+@version
@loadConfigUrl exchangeUrl, (err,parsedData) ->
return next(err) if err
@exchange = parsedData
return next(null,parsedData)
Expand Down

0 comments on commit 210a2e4

Please sign in to comment.