Merge branch 'master' into staging

This commit is contained in:
Vinicius Moreira
2021-01-14 08:42:47 -03:00
3 changed files with 3 additions and 3 deletions

View File

@@ -184,7 +184,7 @@ database:
- **synchronize packages database**: synchronizes the database against the configured mirrors (`sudo pacman -Syy`)
- **refresh mirrors**: allows the user to define multiple mirrors locations and sort by the fastest (`sudo pacman-mirrors -c country1,country2 && sudo pacman-mirrors --fasttrack 5 && sudo pacman -Syy`)
- **quick system upgrade**: it executes a default pacman upgrade (`pacman -Syyu --noconfirm`)
- **clean cache**: it cleans the pacman cache diretory (default: `/var/cache/pacman/pkg`)
- **clean cache**: it cleans the pacman cache directory (default: `/var/cache/pacman/pkg`)
- **mark PKGBUILD as editable**: it marks a given PKGBUILD of a package as editable (a popup with the PKGBUILD will be displayed before upgrading/downgrading this package). Action only available when the configuration property **edit_aur_pkgbuild** is not **false**.
- **unmark PKGBUILD as editable**: reverts the action described above. Action only available when the configuration property **edit_aur_pkgbuild** is not **false**.
- **check Snaps support**: checks if the Snapd services are properly enabled.

View File

@@ -5,7 +5,7 @@ from bauh.api.abstract.view import MessageType, ViewComponent
class ProcessWatcher:
"""
Represents an view component watching background processes. It's a bridge for ApplicationManager instances notifiy the view of processes progression and also
Represents an view component watching background processes. It's a bridge for ApplicationManager instances notify the view of processes progression and also
request any user interaction without the need of knowing any GUI code.
"""

View File

@@ -1071,7 +1071,7 @@ class ArchManager(SoftwareManager):
return True
except:
self.logger.error("An error occured while removing packages: {}".format(', '.join(to_remove)))
self.logger.error("An error occurred while removing packages: {}".format(', '.join(to_remove)))
traceback.print_exc()
output_handler.stop_working()
output_handler.join()