Merge branch 'busybox' into merge

Conflicts:
	include/libbb.h
	shell/ash.c

1 files changed, 6 insertions, 1 deletions

diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 8057f2cec..6f59fda29 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -114,6 +114,10 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
                          * an error. */
                         if ((mode != -1) && (chmod(path, mode) < 0)) {
                                 fail_msg = "set permissions of";
+                                if (flags & FILEUTILS_IGNORE_CHMOD_ERR) {
+                                        flags = 0;
+                                        goto print_err;
+                                }
                                 break;
                         }
                         goto ret0;
@@ -123,8 +127,9 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
                 *s2 = c;
         } /* while (1) */
 
-        bb_perror_msg("can't %s directory '%s'", fail_msg, path);
         flags = -1;
+ print_err:
+        bb_perror_msg("can't %s directory '%s'", fail_msg, path);
         goto ret;
  ret0:
         flags = 0;