Merge pull request #4427 from dciangot/master

cache_area and TransferWorker fix
dmwm · Aug 12, 2015 · e3be5be · e3be5be
2 parents 2687807 + 9702586
commit e3be5be
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/couchapp/DBSPublisher/views/cache_area/map.js b/src/couchapp/DBSPublisher/views/cache_area/map.js
@@ -2,8 +2,5 @@ function(doc) {
 
         if (doc.publication_state != 'published' && doc.publication_state != 'publication_failed' && doc.state == 'done' && doc.lfn && doc.dbs_url && doc.rest_host && doc.rest_uri && doc.publish == 1) {
                                         emit( doc.user, [doc.rest_host, doc.rest_uri]);
-                        }
-                }
         }
 }
-
diff --git a/src/python/AsyncStageOut/TransferWorker.py b/src/python/AsyncStageOut/TransferWorker.py
@@ -523,7 +523,7 @@ def mark_failed(self, files=[], force_fail=False, submission_error=False, failur
                 else:
                     temp_lfn = lfn
             else:
-                if 'temp' not in lfn['value']:
+                if 'temp' not in lfn['value'][0]:
                     temp_lfn = lfn['value'][0].replace('store', 'store/temp', 1)
                 else:
                     temp_lfn = lfn['value'][0]
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,5 @@ function(doc) { @@
             if (doc.publication_state != 'published' && doc.publication_state != 'publication_failed' && doc.state == 'done' && doc.lfn && doc.dbs_url && doc.rest_host && doc.rest_uri && doc.publish == 1) {
                                             emit( doc.user, [doc.rest_host, doc.rest_uri]);
-                            }
-                    }
             }
     }