platypush/platypush
platypush
/
platypush
2
2
Fork 4
Code Issues 32 Pull Requests Packages Projects 4 Releases Wiki Activity

Better Docker support #277

Merged
blacklight merged 66 commits from 276/better-docker into master 2023-09-04 02:49:15 +02:00
Conversation 0 Commits 66 Files Changed 66 +10 -3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9aaf2559fa - Show all commits

7
platypush/utils/__init__.py
View File

@ -655,4 +655,11 @@ def get_src_root() -> str:
return os.path.dirname(inspect.getfile(platypush))
def is_root() -> bool:
"""
:return: True if the current user is root/administrator.
"""
return os.getuid() == 0
# vim:sw=4:ts=4:et:

6
platypush/utils/manifest.py
View File

@ -30,7 +30,7 @@ from typing_extensions import override
import yaml
from platypush.message.event import Event
from platypush.utils import get_src_root
from platypush.utils import get_src_root, is_root
_available_package_manager = None
logger = logging.getLogger(__name__)
@ -250,7 +250,7 @@ class Dependencies:
"""
:return: True if the system dependencies should be installed with sudo.
"""
return not (self._is_docker or os.getuid() == 0)
return not (self._is_docker or is_root())
@staticmethod
def _get_requirements_dir() -> str:
@ -359,7 +359,7 @@ class Dependencies:
dependencies on the system.
"""
wants_sudo = not (self._is_docker or os.getuid() == 0)
wants_sudo = not (self._is_docker or is_root())
pkg_manager = self.pkg_manager or PackageManagers.scan()
if self.packages and pkg_manager: