Merge branch 'master' into staging

# Conflicts:
#	bauh/gems/appimage/controller.py
#	bauh/gems/arch/updates.py
This commit is contained in:
Vinicius Moreira
2022-12-12 07:53:51 -03:00
66 changed files with 249 additions and 245 deletions

View File

@@ -79,7 +79,7 @@ def get_version() -> Optional[Tuple[str, ...]]:
def get_app_info(app_id: str, branch: str, installation: str) -> Optional[str]:
try:
return run_cmd(f'flatpak info {app_id} {branch} --{installation}')
except:
except Exception:
traceback.print_exc()
return ''
@@ -234,7 +234,7 @@ def fill_updates(version: Tuple[str, ...], installation: str, res: Dict[str, Set
for line in output.split(f'Updating in {installation}:\n')[1].split('\n'):
if not line.startswith('Is this ok'):
res['full'].add('{}/{}'.format(installation, line.split('\t')[0].strip()))
except:
except Exception:
traceback.print_exc()
else:
updates = new_subprocess(('flatpak', 'update', f'--{installation}', '--no-deps')).stdout
@@ -269,7 +269,7 @@ def fill_updates(version: Tuple[str, ...], installation: str, res: Dict[str, Set
res['full'].add(update_id)
else:
res['full'].add(update_id)
except:
except Exception:
traceback.print_exc()
@@ -292,7 +292,7 @@ def get_app_commits(app_ref: str, origin: str, installation: str, handler: Proce
return
else:
return re.findall(r'Commit+:\s(.+)', output)
except:
except Exception:
raise NoInternetException()
@@ -478,11 +478,11 @@ def map_update_download_size(app_ids: Iterable[str], installation: str, version:
if size and len(size) > 1:
try:
res[related_id[0].strip()] = size_to_byte(size[0], size[1].strip())
except:
except Exception:
traceback.print_exc()
else:
try:
res[related_id[0].strip()] = size_to_byte(size_tuple[0], size_tuple[1].strip())
except:
except Exception:
traceback.print_exc()
return res