Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/286073
Change subject: Fix `--domainname` option when bundling a collection from the
command line.
......................................................................
Fix `--domainname` option when bundling a collection from the command line.
Change-Id: I70c7c4e628f3e0482699f07a4e1ddd13aca236e1
---
M lib/metabook.js
1 file changed, 4 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator/bundler
refs/changes/73/286073/1
diff --git a/lib/metabook.js b/lib/metabook.js
index 300884d..ba3f64a 100644
--- a/lib/metabook.js
+++ b/lib/metabook.js
@@ -199,9 +199,11 @@
// Return a promise for a metabook from the given collection.
var metabookFromCollection = function(collection, options, log) {
+ // Work around commander issues with a flag named 'domain'
+ var domain = options.domain || options.domainname;
// First do the prefix-guessing, etc.
return metabookFromArticles(
- [{ prefix: options.prefix, domain: options.domain, title:
collection }],
+ [{ prefix: options.prefix, domain: domain, title: collection }],
options
).then(function(m) {
// Use this to fetch the source of the collection page.
@@ -223,7 +225,7 @@
// confirm rel="mw:WikiLink".
var title =
parsoidResult._resolve(links[i].getAttribute('href'));
articles.push({
- prefix: options.prefix, domain: options.domain,
title: title,
+ prefix: options.prefix, domain: domain, title:
title,
});
}
return metabookFromArticles(articles, options);
--
To view, visit https://gerrit.wikimedia.org/r/286073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70c7c4e628f3e0482699f07a4e1ddd13aca236e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
