Merge lp:~gesha/linaro-license-protection/staging-upload-paths into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch adds publishing to staging.snapshots.linaro.org server into correct paths.

[Stevan Radaković (stevanr)]

Looks good.
Approve +1.

review: Approve

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2012-08-22 19:33:22 +0000
+++ scripts/publish_to_snapshots.py	2012-08-24 19:15:24 +0000
@@ -10,6 +10,8 @@
 
 uploads_path = '/srv/snapshots.linaro.org/uploads/'
 target_path = '/srv/snapshots.linaro.org/www/'
+staging_uploads_path = '/srv/staging.snapshots.linaro.org/uploads/'
+staging_target_path = '/srv/staging.snapshots.linaro.org/www/'
 PASS = 0
 FAIL = 1
 acceptable_job_types = [
@@ -324,6 +326,8 @@
 
 
 def main():
+    global uploads_path
+    global target_path
     argument_parser = setup_parser()
     publisher = SnapshotsPublisher(argument_parser)
     args = argument_parser.parse_args()
@@ -331,6 +335,9 @@
         publisher.validate_args(args)
     except PublisherArgumentException as exception:
         argument_parser.error(exception.message)
+    if args.staging:
+        uploads_path = staging_uploads_path
+        target_path = staging_target_path
     try:
         build_dir_path, target_dir_path = publisher.validate_paths(
             args, uploads_path, target_path)