From 5f20b72502bf55f1999910be5ebb2eba28fa8f59 Mon Sep 17 00:00:00 2001 From: Dakota Benjamin Date: Fri, 1 Sep 2017 11:32:20 -0400 Subject: [PATCH] Delete data on rerun-all Former-commit-id: 1e413904b9c6837a1df9faf64e7f487e768653bb --- README.md | 2 +- run.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c8059d68..4812ffa0 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ has equivalent procedures for Mac OS X and Windows found at [docs.docker.com](do docker run -it --rm -v $(pwd)/images:/code/images -v $(pwd)/odm_orthophoto:/code/odm_orthophoto -v $(pwd)/odm_texturing:/code/odm_texturing opendronemap/opendronemap ``` -### Native Install (Ubuntu Trusty or Xenial) +### Native Install (Ubuntu 16.04) ** Please note that we need help getting ODM updated to work for 16.10+. Look at #659 or drop into the [gitter][https://gitter.im/OpenDroneMap/OpenDroneMap) for more info. diff --git a/run.py b/run.py index bb2e2f86..4a60471d 100644 --- a/run.py +++ b/run.py @@ -25,14 +25,15 @@ if __name__ == '__main__': # If user asks to rerun everything, delete all of the existing progress directories. # TODO: Move this somewhere it's not hard-coded if args.rerun_all: + log.ODM_DEBUG("Rerun all -- Removing old data") os.system("rm -rf " - + args.project_path + "images_resize/ " - + args.project_path + "odm_georeferencing/ " - + args.project_path + "odm_meshing/ " - + args.project_path + "odm_orthophoto/ " - + args.project_path + "odm_texturing/ " - + args.project_path + "opensfm/ " - + args.project_path + "pmvs/") + + args.project_path + "/images_resize " + + args.project_path + "/odm_georeferencing " + + args.project_path + "/odm_meshing " + + args.project_path + "/odm_orthophoto " + + args.project_path + "/odm_texturing " + + args.project_path + "/opensfm " + + args.project_path + "/pmvs") # create an instance of my App BlackBox # internally configure all tasks