Migrate central repo to alchemy 4.

scripts/cleanup_datasets/cleanup_datasets.py

@@ -13,8 +13,8 @@ from galaxy import eggs
 import galaxy.model.mapping
 import pkg_resources
         
-pkg_resources.require( "sqlalchemy>=0.3" )
-from sqlalchemy import eagerload
+pkg_resources.require( "SQLAlchemy >= 0.4" )
+from sqlalchemy.orm import eagerload
 
 assert sys.version_info[:2] >= ( 2, 4 )
 
@@ -191,8 +191,6 @@ def purge_histories( h, d, m, cutoff_time, remove_from_disk ):
                             if errmsg:
                                 errors = True
                                 print errmsg
-                            else:
-                                print "%s" % dataset.file_name
                         else:
                             dataset.purged = True
                             dataset.flush()
@@ -258,7 +256,6 @@ def purge_datasets( d, m, cutoff_time, remove_from_disk ):
                print errmsg
             else:
                 dataset_count += 1
-                print "%s" % dataset.file_name
         else:
             dataset.purged = True
             dataset.file_size = 0
@@ -302,6 +299,7 @@ def purge_dataset( dataset, m ):
             else:
                 # Remove dataset file from disk
                 os.unlink( dataset.file_name )
+                print "%s" % dataset.file_name
                 # Mark all associated MetadataFiles as deleted and purged and remove them from disk
                 print "The following metadata files associated with dataset '%s' have been purged" % dataset.file_name
                 for hda in dataset.history_associations: