diff options
| -rwxr-xr-x | install/ishtar-delete-instance | 14 | ||||
| -rw-r--r-- | ishtar_common/data_importer.py | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/install/ishtar-delete-instance b/install/ishtar-delete-instance index d2f5115c4..46b0d86c6 100755 --- a/install/ishtar-delete-instance +++ b/install/ishtar-delete-instance @@ -86,13 +86,6 @@ do_delete_instance() { rm -f "$UWSGI_AVAILABLE_PATH/ishtar-$INSTANCE.ini" rm -f "$UWSGI_ENABLE_PATH/ishtar-$INSTANCE.ini" - DB_NAME="ishtar-$INSTANCE" - export DB_NAME - su postgres <<'EOF' - dropdb "$DB_NAME" - dropuser "$DB_NAME" -EOF - if [ -v USE_CELERY ]; then systemctl disable celery-$INSTANCE systemctl stop celery-$INSTANCE @@ -103,6 +96,13 @@ EOF systemctl daemon-reload fi + DB_NAME="ishtar-$INSTANCE" + export DB_NAME + su postgres <<'EOF' + dropdb "$DB_NAME" + dropuser "$DB_NAME" +EOF + echo "" cecho g $to_delete" have been completly removed" echo "" diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 72b42dd71..7088eee08 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -922,7 +922,6 @@ class Importer(object): getattr(item, func)(context, value) except ImporterError as msg: self.errors.append((idx_line, None, msg)) - print("OK - post - {}".format(item)) return item def initialize(self, table, output='silent', choose_default=False, |