OS-4102: OS-4097 broke import of uncompressed images

TritonDataCenter · Mar 24, 2015 · 3523ebe · 3523ebe
1 parent 12e0264
commit 3523ebe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/img/CHANGES.md b/src/img/CHANGES.md
@@ -2,6 +2,12 @@
 
 ## 3.1.2
 
+- [OS-4102] OS-4097 broke import of uncompressed images
+
+## 3.1.2
+
+*Bad version.*
+
 - [OS-4097] support xz-compressed Docker images, e.g. learn/tutorial
 
 

diff --git a/src/img/lib/imgadm.js b/src/img/lib/imgadm.js
@@ -2113,7 +2113,6 @@ IMGADM.prototype._installDockerImage = function _installDockerImage(ctx, cb) {
          */
         function extract(_, next) {
             assert.string(ctx.filePath, 'ctx.filePath');
-            assert.optionalString(ctx.cType, 'ctx.cType');
 
             if (ctx.cType === 'xz') {
                 common.execPlus({

diff --git a/src/img/package.json b/src/img/package.json
@@ -1,7 +1,7 @@
 {
   "name": "imgadm",
   "description": "Manage SmartOS virtual machine images.",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "author": "Joyent (joyent.com)",
   "private": true,
   "dependencies": {