Skip to content

Commit

Permalink
added smaller bugfixes for version <3.13 package.py logging errors (#190
Browse files Browse the repository at this point in the history
)
  • Loading branch information
Grashalmbeisser authored Nov 8, 2024
1 parent 65fbde3 commit 569bff7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
7 changes: 4 additions & 3 deletions src/viur_cli/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from pathlib import Path
from urllib.request import urlretrieve
from . import cli, echo_error, echo_info
from operator import itemgetter

REPOS = {
"vi": ("viur-framework/viur-vi", "viur-vi.zip"),
Expand Down Expand Up @@ -142,7 +143,7 @@ def scriptor(version, target, profile):

real_version, download_url = get_version_info("scriptor", version)

old_version = conf.get("builds.scriptor.version")
old_version=conf.get('builds').get('scriptor').get('version')

if old_version == real_version.strip("v"):
if not click.confirm(f"You have already installed version {old_version} of scriptor.\n"
Expand Down Expand Up @@ -185,7 +186,7 @@ def admin(version: str, target: str, profile):

real_version, download_url = get_version_info("admin", version)

old_version = conf.get("builds.admin.version")
old_version=conf.get('builds').get('admin').get('version')

if old_version == real_version.strip("v"):
if not click.confirm(f"You have already installed the version {old_version} of admin.\n"
Expand Down Expand Up @@ -233,7 +234,7 @@ def vi(version, target, profile):
dist_folder = conf["distribution_folder"]

real_version, download_url = get_version_info("vi", version)
old_version = conf.get("builds.vi.version")
old_version = conf.get('builds').get('vi').get('version')

if old_version == real_version.strip("v"):
if not click.confirm(f"You have already installed the version {old_version} of vi.\n"
Expand Down
5 changes: 2 additions & 3 deletions src/viur_cli/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@ def clean_base(app_id, author=None):
echo_info(subprocess.check_output("git branch -D main", shell=True).decode().rstrip("\n"))

subprocess.check_output("git branch -m main", shell=True)
echo_info(
f"Current branch is: {subprocess.check_output("git branch --show-current", shell=True)
.decode().rstrip("\n")}")
echo_info(f"Current branch is: {subprocess.check_output(
'git branch --show-current', shell=True).decode().rstrip('\n')}")
echo_info("---")

echo_info("Generating project documentation...")
Expand Down

0 comments on commit 569bff7

Please sign in to comment.