IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-10 23:45:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

The 'pwd' module is not available on Windows, so replacing it with the 'getpass' module.

Browse Source 
refs #5576
This commit is contained in:
Akshay Joshi 2020-06-02 14:09:44 +05:30
parent c932213abd
commit a1a232a1f1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/pgadmin/setup/data_directory.py
View File

@ -8,7 +8,7 @@
########################################################################## ##########################################################################
import os import os
import pwd import getpass
def _create_directory_if_not_exists(_path): def _create_directory_if_not_exists(_path):
@ -33,7 +33,7 @@ def create_app_data_directory(config):
" https://www.pgadmin.org/docs/pgadmin4/{}/config_py.html". " https://www.pgadmin.org/docs/pgadmin4/{}/config_py.html".
format( format(
os.path.dirname(config.SQLITE_PATH), os.path.dirname(config.SQLITE_PATH),
pwd.getpwuid(os.getuid()).pw_name, getpass.getuser(),
config.APP_VERSION)) config.APP_VERSION))
exit(1) exit(1)
@ -50,7 +50,7 @@ def create_app_data_directory(config):
print("HINT : You may need to manually set the permissions on\n" print("HINT : You may need to manually set the permissions on\n"
" {} to allow {} to write to it.". " {} to allow {} to write to it.".
format(os.path.dirname(config.SQLITE_PATH), format(os.path.dirname(config.SQLITE_PATH),
pwd.getpwuid(os.getuid()).pw_name)) getpass.getuser()))
# Create the directory containing the log file (if not present). # Create the directory containing the log file (if not present).
try: try:
@ -65,7 +65,7 @@ def create_app_data_directory(config):
" https://www.pgadmin.org/docs/pgadmin4/{}/config_py.html". " https://www.pgadmin.org/docs/pgadmin4/{}/config_py.html".
format( format(
os.path.dirname(config.LOG_FILE), os.path.dirname(config.LOG_FILE),
pwd.getpwuid(os.getuid()).pw_name, getpass.getuser(),
config.APP_VERSION)) config.APP_VERSION))
exit(1) exit(1)
@ -82,7 +82,7 @@ def create_app_data_directory(config):
" https://www.pgadmin.org/docs/pgadmin4/{}/config_py.html". " https://www.pgadmin.org/docs/pgadmin4/{}/config_py.html".
format( format(
config.SESSION_DB_PATH, config.SESSION_DB_PATH,
pwd.getpwuid(os.getuid()).pw_name, getpass.getuser(),
config.APP_VERSION)) config.APP_VERSION))
exit(1) exit(1)
@ -102,6 +102,6 @@ def create_app_data_directory(config):
" https://www.pgadmin.org/docs/pgadmin4/{}/config_py.html". " https://www.pgadmin.org/docs/pgadmin4/{}/config_py.html".
format( format(
config.STORAGE_DIR, config.STORAGE_DIR,
pwd.getpwuid(os.getuid()).pw_name, getpass.getuser(),
config.APP_VERSION)) config.APP_VERSION))
exit(1) exit(1)