Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

Fix file::create-dir(): if the directory exists, do nothing.

Fix file::create-dir(): if the directory exists, do nothing.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Ghislain Fourny (gislenius)]

Perfect, thanks Paul!

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-06-13T15-43-43.672Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-06-13T15-43-43.672Z is finished. The final status was:

All tests succeeded!

=== modified file 'modules/org/expath/ns/file.xq.src/file.cpp'
--- modules/org/expath/ns/file.xq.src/file.cpp	2013-06-13 01:21:36 +0000
+++ modules/org/expath/ns/file.xq.src/file.cpp	2013-06-13 14:38:46 +0000
@@ -75,15 +75,18 @@
 {
   String const path( getPathArg( args, 0 ) );
 
-  if ( fs::get_type( path ) )
+  fs::type const fs_type = fs::get_type( path );
+  if ( !fs_type )
+    try {
+      fs::mkdir( path );
+    }
+    catch ( std::exception const &e ) {
+      throw raiseFileError( "FOFL9999", e.what(), path );
+    }
+  else if ( fs_type != fs::directory )
     raiseFileError( "FOFL0002", "file already exists", path );
-
-  try {
-    fs::mkdir( path );
-  }
-  catch ( std::exception const &e ) {
-    throw raiseFileError( "FOFL9999", e.what(), path );
-  }
+  else
+    /* directory already exists: do nothing */;
 
   return ItemSequence_t( new EmptySequence() );
 }