Mwalker has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/149266

Change subject: Make file moving play nicely
......................................................................

Make file moving play nicely

Change-Id: I4c4b146cd56224e84c23e9242196964f199e3c75
---
M lib/threads/backend.js
1 file changed, 12 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator
 refs/changes/66/149266/1

diff --git a/lib/threads/backend.js b/lib/threads/backend.js
index 4660978..2a3fa3b 100644
--- a/lib/threads/backend.js
+++ b/lib/threads/backend.js
@@ -233,19 +233,25 @@
                                if ( metabookFile ) {
                                        mv(
                                                metabookFile,
-                                               path.join( 
config.backend.post_mortem_dir, path.basename( metabookFile ) )
+                                               path.join( 
config.backend.post_mortem_dir, path.basename( metabookFile ) ),
+                                               { mkdirp: true },
+                                               function() {}
                                        );
                                }
                                if ( bundleFile ) {
                                        mv(
                                                bundleFile,
-                                               path.join( 
config.backend.post_mortem_dir, path.basename( bundleFile ) )
+                                               path.join( 
config.backend.post_mortem_dir, path.basename( bundleFile ) ),
+                                               { mkdirp: true },
+                                               function() {}
                                        );
                                }
                                if ( renderedFile ) {
                                        mv(
                                                renderedFile,
-                                               path.join( 
config.backend.post_mortem_dir, path.basename( renderedFile ) )
+                                               path.join( 
config.backend.post_mortem_dir, path.basename( renderedFile ) ),
+                                               { mkdirp: true },
+                                               function() {}
                                        );
                                }
                        }
@@ -276,8 +282,9 @@
                } )
                .then( function() {
                        // Cleanup any mess we left, leave the rendered file 
for later pickup
-                       if ( metabookFile ) { rimraf( metabookFile ); }
-                       if ( bundleFile ) { rimraf( bundleFile ); }
+                       var rrp = Promise.promisify( rimraf );
+                       if ( metabookFile ) { rrp( metabookFile ); }
+                       if ( bundleFile ) { rrp( bundleFile ); }
                } );
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/149266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c4b146cd56224e84c23e9242196964f199e3c75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Mwalker <mwal...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to