Skip to content

Commit

Permalink
Merge branch 'release_17.09' into release_18.01
Browse files Browse the repository at this point in the history
  • Loading branch information
nsoranzo committed Mar 19, 2018
2 parents 127d7b8 + 5dcd9ed commit 74d0bcb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions scripts/cleanup_datasets/admin_cleanup_datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
from six.moves import configparser
from sqlalchemy import and_, false

sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, 'lib')))

import galaxy.config
import galaxy.model.mapping
import galaxy.util
Expand Down
4 changes: 3 additions & 1 deletion scripts/cleanup_datasets/update_dataset_size.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

from six.moves import configparser

sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, 'lib')))

import galaxy.app

assert sys.version_info[:2] >= (2, 6)
Expand All @@ -24,7 +26,7 @@ def usage(prog):


def main():
if len(sys.argv) != 1 or sys.argv[1] == "-h" or sys.argv[1] == "--help":
if len(sys.argv) != 2 or sys.argv[1] == "-h" or sys.argv[1] == "--help":
usage(sys.argv[0])
sys.exit()
ini_file = sys.argv.pop(1)
Expand Down

0 comments on commit 74d0bcb

Please sign in to comment.