Merge pull request #22775 from ggovi/condcore-utilities-popcon2dropbo…

…x-fix0-10-1-X

Fix for the popcon procedure

CondCore/Utilities/python/popcon2dropbox.py

@@ -9,8 +9,8 @@
 from datetime import datetime
 
 errorInImportFileFolder = 'import_errors'
-dateformatForFolder = "%y-%m-%d-%H-%M-%S"
-dateformatForLabel = "%y-%m-%d %H:%M:%S"
+dateformatForFolder = "%Y-%m-%d-%H-%M-%S"
+dateformatForLabel = "%Y-%m-%d %H:%M:%S"
 
 auth_path_key = 'COND_AUTH_PATH'
 
@@ -183,10 +183,10 @@ def run( args ):
        return retCode
 
     ret = checkFile( dbName )
-    if ret < 0:
-        return ret
-    elif ret == 0:
-        return 0
-    if args.copy:
-        return copy( args, dbName )
-    return upload( args, dbName )
+    if ret > 0:
+        if args.copy:
+            ret = copy( args, dbName )
+        else:
+            ret = upload( args, dbName )
+    os.remove( '%s.db' %dbName )
+    return ret