Skip to content

Commit

Permalink
OS-4541: imgadm: clarify that the 'size' field from <source>.getImgMe…
Browse files Browse the repository at this point in the history
…ta is optional
  • Loading branch information
trentm committed Jul 23, 2015
1 parent d97b809 commit 514a1db
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/img/lib/imgadm.js
Expand Up @@ -1721,7 +1721,7 @@ IMGADM.prototype._importImage = function _importImage(opts, cb) {
worker: function getManifestIfNotInstalled(irec, nextManifest) { worker: function getManifestIfNotInstalled(irec, nextManifest) {
if (cosmicRay) { if (cosmicRay) {
nextManifest(new errors.InternalError({ nextManifest(new errors.InternalError({
message: 'getMeta cosmic raw' message: 'getMeta cosmic ray'
})); }));
return; return;
} }
Expand Down
2 changes: 0 additions & 2 deletions src/img/lib/magic.js
Expand Up @@ -26,11 +26,9 @@
* Magic number sniffing of compression type of files. * Magic number sniffing of compression type of files.
*/ */


var p = console.log;
var assert = require('assert-plus'); var assert = require('assert-plus');
var format = require('util').format; var format = require('util').format;
var fs = require('fs'); var fs = require('fs');
var vasync = require('vasync');






Expand Down
2 changes: 1 addition & 1 deletion src/img/lib/sources/source.js
Expand Up @@ -173,9 +173,9 @@ Source.prototype.getImgAncestry = function getImgAncestry(opts, cb) {
* imgMeta = { * imgMeta = {
* // Required: * // Required:
* "manifest": {...}, * "manifest": {...},
* "size": <size-of-the-file-in-bytes>,
* *
* // Optional: * // Optional:
* "size": <size-of-the-file-in-bytes>,
* "checksum": "<file checksum in the format TYPE:HEXDIGEST, * "checksum": "<file checksum in the format TYPE:HEXDIGEST,
* e.g. 'sha256:23498af90e8g9...'>", * e.g. 'sha256:23498af90e8g9...'>",
* *
Expand Down

0 comments on commit 514a1db

Please sign in to comment.