Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# to update i18n .mo files (and merge .pot file into .po files) run on Linux:
# python setup.py build_i18n -m''

__VERSION__ = '6.3'
__VERSION__ = '6.8'

PROGRAM_VERSION = __VERSION__
prefix = sys.prefix
Expand All @@ -21,8 +21,7 @@ def data_file_list(install_base, source_base):
data = []
for root, subFolders, files in os.walk(source_base):
file_list = []
for f in files:
file_list.append(os.path.join(root, f))
file_list.extend(os.path.join(root, f) for f in files)
data.append((root.replace(source_base, install_base), file_list))
return data

Expand Down
9 changes: 4 additions & 5 deletions update_station/frontend.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ def delete_event(self, widget: Gtk.Widget) -> None:
Function that handles the delete event when the window is closed.
:param widget: The widget that triggered the delete event.
"""
if Data.close_session is True:
if Data.close_session:
if updating():
unlock_update_station()
Gtk.main_quit()
else:
self.window.destroy()
if Data.update_started is False:
if not Data.update_started:
Data.stop_pkg_refreshing = False
if updating():
unlock_update_station()
Expand All @@ -67,7 +67,7 @@ def start_update(self, widget):
"""
Data.update_started = True
InstallUpdate()
self.window.hide()
self.window.destroy()

def if_backup(self, widget):
"""
Expand Down Expand Up @@ -283,7 +283,6 @@ def should_destroy_be(cls, be_line: str, today_str: str) -> bool:
'NR' not in active_status
)


def read_output(self, progress):
"""
Function that reads the output of the update to update the progress bar.
Expand Down Expand Up @@ -586,4 +585,4 @@ def stop_tread(self, start_window: object):
:param start_window: The start window object.
"""
start_window()
self.win.hide()
self.win.destroy()
2 changes: 1 addition & 1 deletion update_station/notification.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@ def on_clicked(self, widget):
else:
Data.major_upgrade = False
Data.do_not_upgrade = True
self.hide()
self.destroy()