From 4a8e8008522b044352f945e92aa3327f1e81290b Mon Sep 17 00:00:00 2001 From: checktheroads Date: Tue, 11 Jun 2019 21:47:06 -0700 Subject: [PATCH] fixed missing import statements, removed uncessary import references --- manage.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/manage.py b/manage.py index c86ee42..cecc4cf 100755 --- a/manage.py +++ b/manage.py @@ -560,9 +560,9 @@ def migratesystemd(directory): """Copies example systemd service file to /etc/systemd/system/""" try: click.secho("Migrating example systemd service...", fg="black") - hyperglass_root = os.path.dirname(hyperglass.__file__) + working_directory = os.path.dirname(os.path.abspath(__file__)) ex_file_base = "hyperglass.service.example" - ex_file = os.path.join(hyperglass_root, ex_file_base) + ex_file = os.path.join(working_directory, f"hyperglass/{ex_file_base}") basefile, extension = os.path.splitext(ex_file_base) newfile = os.path.join(directory, basefile) if os.path.exists(newfile): @@ -591,6 +591,10 @@ def migratesystemd(directory): @click.option("--group", default="www-data") def fixpermissions(user, group): """Effectively runs `chmod` and `chown` on the hyperglass/hyperglass directory""" + try: + import hyperglass + except ImportError as error_exception: + click.secho(f"Error importing hyperglass:\n{error_exception}") hyperglass_root = os.path.dirname(hyperglass.__file__) uid = pwd.getpwnam(user).pw_uid gid = grp.getgrnam(group).gr_gid