Merge pull request #1810 from QuLogic/pycharm-warnings

Fix various warnings found in PyCharm

1 files changed, 3 insertions, 3 deletions

diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py
index 713d685..b17d931 100644
--- a/mesonbuild/wrap/wrap.py
+++ b/mesonbuild/wrap/wrap.py
@@ -178,7 +178,6 @@ class Resolver:
         if is_there:
             try:
                 subprocess.check_call(['git', 'rev-parse'], cwd=checkoutdir)
-                is_there = True
             except subprocess.CalledProcessError:
                 raise RuntimeError('%s is not empty but is not a valid '
                                    'git repository, we can not work with it'
@@ -302,12 +301,13 @@ class Resolver:
             try:
                 import lzma
                 del lzma
+            except ImportError:
+                pass
+            else:
                 try:
                     shutil.register_unpack_format('xztar', ['.tar.xz', '.txz'], shutil._unpack_tarfile, [], "xz'ed tar-file")
                 except shutil.RegistryError:
                     pass
-            except ImportError:
-                pass
         target_dir = os.path.join(self.subdir_root, package.get('directory'))
         if os.path.isdir(target_dir):
             return