Merge lp:~gesha/linaro-license-protection/fix-dir-sanitizing into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch fixes sanitizing of dir with subdirs.
Previously it worked only with files in dir and failed on first found subdir with following error: In main() Exception details: [Errno 21] Is a directory: '/srv/staging.snapshots.linaro.org/uploads/android/gesha_staging-publishing-test/7/target'
Now recursion works correctly.

[James Tunnicliffe (dooferlad)]

Do you want os.makedirs rather than os.mkdir (it is more like mkdir -p)?

[Deepti B. Kalakeri (deeptik)]

Looks good. +1

review: Approve

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2012-08-24 19:12:20 +0000
+++ scripts/publish_to_snapshots.py	2012-08-28 20:33:19 +0000
@@ -265,17 +265,19 @@
                 dest = os.path.join(dest_dir, file)
                 if os.path.exists(dest):
                     if os.path.isdir(dest):
-                        self.move_dir_content(src, dest)
                         continue
                     else:
                         os.remove(dest)
-                if sanitize and not self.is_accepted_for_staging(src):
-                    # Perform the sanitization before moving the file
-                    # into place.
-                    print "Sanitizing contents of '%s'." % src
-                    self.sanitize_file(src)
-                print "Moving the src '", src, "'to dest'", dest, "'"
-                shutil.move(src, dest)
+                if os.path.isdir(src):
+                    os.mkdir(dest)
+                    self.move_dir_content(src, dest, sanitize)
+                else:
+                    if sanitize and not self.is_accepted_for_staging(src):
+                        # Perform the sanitization before moving the file
+                        # into place.
+                        print "Sanitizing contents of '%s'." % src
+                        self.sanitize_file(src)
+                    shutil.move(src, dest)
         except shutil.Error:
             print "Error while moving the content"