From 18c811ac967110d9371cc5dcdcd44382b25b0494 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 8 Nov 2020 23:12:49 +0000 Subject: Added some more debugging --- VERSION | 2 +- archinstall/lib/profiles.py | 6 ++++-- make.sh | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index ba0bc5d4..e933c631 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.6rc11 \ No newline at end of file +2.0.6rc13 \ No newline at end of file diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py index 015d41b7..f20726d2 100644 --- a/archinstall/lib/profiles.py +++ b/archinstall/lib/profiles.py @@ -65,11 +65,13 @@ def find_installation_script(profile): with open(profile, 'r') as file: return Script(file.read(), filename=os.path.basename(profile)) except FileNotFoundError: - return ProfileNotFound(f"File {profile} does not exist") + cwd = os.path.abspath(f'{os.path.dirname(__file__)}') + examples = f"{cwd}/examples" + raise ProfileNotFound(f"File {profile} does not exist in {examples}") elif parsed_url.scheme in ('https', 'http'): return Script(urllib.request.urlopen(profile).read().decode('utf-8'), filename=os.path.basename(profile)) else: - return ProfileNotFound(f"Cannot handle scheme {parsed_url.scheme}") + raise ProfileNotFound(f"Cannot handle scheme {parsed_url.scheme}") class Imported(): diff --git a/make.sh b/make.sh index 6f645ad2..ec903ffb 100755 --- a/make.sh +++ b/make.sh @@ -5,10 +5,10 @@ VERSION=$(cat VERSION) rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ "archinstall-v${VERSION}-x86_64/" *.pkg.*.xz archinstall-*.tar.gz -nuitka3 --standalone --show-progress archinstall -cp -r examples/ archinstall.dist/ -mv archinstall.dist "archinstall-v${VERSION}-x86_64" -tar -czvf "archinstall-v${VERSION}.tar.gz" "archinstall-v${VERSION}-x86_64" +#nuitka3 --standalone --show-progress archinstall +#cp -r examples/ archinstall.dist/ +#mv archinstall.dist "archinstall-v${VERSION}-x86_64" +#tar -czvf "archinstall-v${VERSION}.tar.gz" "archinstall-v${VERSION}-x86_64" # makepkg -f python3 setup.py sdist bdist_wheel -- cgit v1.2.3-54-g00ecf