Copy image into place instead of moving

lalcmellkmal · May 2, 2014 · b71f1ca · b71f1ca
1 parent 7077037
commit b71f1ca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/etc.js b/etc.js
@@ -56,6 +56,17 @@ exports.movex = function (src, dest, callback) {
 	});
 };
 
+exports.cpx = function (src, dest, callback) {
+	child_process.execFile('/bin/cp', ['-n', '--', src, dest],
+				function (err, stdout, stderr) {
+		if (err)
+			callback(Muggle("Couldn't copy file into place.",
+					stderr || err));
+		else
+			callback(null);
+	});
+};
+
 exports.checked_mkdir = function (dir, cb) {
 	fs.mkdir(dir, function (err) {
 		cb(err && err.code == 'EEXIST' ? null : err);

diff --git a/imager/db.js b/imager/db.js
@@ -146,7 +146,6 @@ O.commit_image_alloc = function (alloc, cb) {
 	var m = this.connect().multi();
 	m.del(key);
 	m.del('lock:' + key);
-	m.srem('temps', alloc.paths);
 	m.exec(cb);
 };
 

diff --git a/imager/index.js b/imager/index.js
@@ -90,7 +90,7 @@ function publish(alloc, cb) {
 		}
 		var dest = media_path(destDir, alloc.image[destKey]);
 
-		mvs.push(etc.movex.bind(etc, src, dest));
+		mvs.push(etc.cpx.bind(etc, src, dest));
 	}
 	async.parallel(mvs, cb);
 }