Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed assert and adding code to fetch PKGBASE to add a progress step #52

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Removed assert and adding code to fetch PKGBASE to add a progress step #52

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3b6d67
remove assert and adding code to fetch PKGBASE to add a progress step
ericbsd Aug 2, 2024
0e45b3d
Update updateHandler.py
ericbsd Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# to update i18n .mo files (and merge .pot file into .po files) run on Linux:
# python setup.py build_i18n -m''

__VERSION__ = '5.5'
__VERSION__ = '5.6'

PROGRAM_VERSION = __VERSION__
prefix = sys.prefix
Expand Down Expand Up @@ -45,7 +45,6 @@ def data_file_list(install_base, source_base):
setup(
name="update-station",
version=PROGRAM_VERSION,
#use_scm_version=True,
description="Update Manager For GhostBSD/FreeBSD",
license='BSD',
author='Eric Turgeon',
Expand Down
49 changes: 28 additions & 21 deletions src/update-station
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ from updateHandler import (
install_ghostbsd_pkgbase,
set_package_base_config_file,
restore_vital_files,
remove_package_config
remove_package_config,
fetch_ghostbsd_pkgbase
)
gettext.bindtextdomain('update-station', '/usr/local/share/locale')
gettext.textdomain('update-station')
Expand Down Expand Up @@ -500,59 +501,65 @@ class UpgradePKGBASEProgress:
progress.set_text(text)

def read_output(self, progress):
fraction = 1.0 / 18
progress_text = _("Setting temporary packages configuration")
fraction = 1.0 / 20
progress_text = _("Setting temporary packages configuration.")
GLib.idle_add(self.update_progress, progress, fraction, progress_text)
assert set_package_base_config_file().returncode == 0
progress_text = _("Temporary packages configuration setting completed")
progress_text = _("Temporary packages configuration setting completed.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
sleep(1)
progress_text = _("Creating boot environment pkgbase-upgrade")
progress_text = _("Creating boot environment pkgbase-upgrade.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
bectl.create_be('pkgbase-upgrade')
progress_text = _("Boot environment pkgbase-upgrade created")
progress_text = _("Boot environment pkgbase-upgrade created.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
sleep(1)
progress_text = _("Mounting boot environment pkgbase-upgrade")
progress_text = _("Mounting boot environment pkgbase-upgrade.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
bectl.mount_be('pkgbase-upgrade', '/tmp/pkgbase-upgrade')
progress_text = _("Boot environment mounted to /tmp/pkgbase-upgrade")
progress_text = _("Boot environment mounted to /tmp/pkgbase-upgrade.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
sleep(1)
progress_text = _("Removing os-generic packages from boot environment")
progress_text = _("Removing os-generic packages from boot environment.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
assert remove_os_generic('/tmp/pkgbase-upgrade').returncode == 0
progress_text = _("os-generic packages are removed from boot environment")
progress_text = _("os-generic packages are removed from boot environment.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
sleep(1)
progress_text = _("Installing PGKBASE in the boot environment")
progress_text = _("Downloading PGKBASE packages. This will take a while.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
assert fetch_ghostbsd_pkgbase('/tmp/pkgbase-upgrade').returncode == 0
progress_text = _("PGKBASE packages download completed.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
sleep(1)
progress_text = _("Installing PGKBASE in the boot environment.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
assert install_ghostbsd_pkgbase('/tmp/pkgbase-upgrade').returncode == 0
progress_text = _("PGKBASE installed in the boot environment")
progress_text = _("PGKBASE installed in the boot environment.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
sleep(1)
progress_text = _("Restoring vital files")
progress_text = _("Restoring vital files.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
assert restore_vital_files('/tmp/pkgbase-upgrade')
progress_text = _("Vital files restored")
restore_vital_files('/tmp/pkgbase-upgrade')
progress_text = _("Vital files restored.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
sleep(1)
progress_text = _("Unmounting boot environment pkgbase-upgrade")
progress_text = _("Unmounting boot environment pkgbase-upgrade.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
bectl.umount_be('pkgbase-upgrade')
progress_text = _("Boot environment unmounted")
progress_text = _("Boot environment unmounted.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
sleep(1)
progress_text = _("Activating pkgbase-upgrade boot environment")
progress_text = _("Activating pkgbase-upgrade boot environment.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
bectl.activate_be('pkgbase-upgrade')
progress_text = _("Activating pkgbase-upgrade boot environment completed")
progress_text = _("Activating pkgbase-upgrade boot environment completed.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
sleep(1)
progress_text = _("Remove temporary package configuration")
progress_text = _("Remove temporary package configuration.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
assert remove_package_config().returncode == 0
progress_text = _("Temporary package configuration removed")
progress_text = _("Temporary package configuration removed.")
GLib.idle_add(self.update_progress, progress, progress.get_fraction() + fraction, progress_text)
sleep(1)
self.stop_tread()
Expand Down
8 changes: 8 additions & 0 deletions src/updateHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,14 @@ def install_ghostbsd_pkgbase(mount_point: str) -> CompletedProcess:
return run_command(f'pkg-static -r {mount_point} install -y -r GhostBSD-base -g "GhostBSD-*"')


def fetch_ghostbsd_pkgbase(mount_point: str) -> CompletedProcess:
ericbsd marked this conversation as resolved.
Show resolved Hide resolved
"""
This function is used to install the GhostBSD-base package.
ericbsd marked this conversation as resolved.
Show resolved Hide resolved
:param mount_point: The mount point of the basepkg-test.
"""
return run_command(f'pkg-static -r {mount_point} fetch -y -r GhostBSD-base -g "GhostBSD-*"')


def restore_vital_files(mount_point: str) -> None:
"""
This function is used to restart the vital files.
Expand Down