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

Do not load sdk_settings.ini for create action #112

Merged
merged 2 commits into from
Feb 28, 2024
Merged

Do not load sdk_settings.ini for create action #112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34e7271
Update make.py
phate999 Feb 28, 2024
5da3987
Update make.py
phate999 Feb 28, 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
17 changes: 11 additions & 6 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ def output_help():


# Get the uuid from application package.ini if not already set
def get_app_uuid(ceate_new_uuid=False):
def get_app_uuid():
global g_app_uuid

if g_app_uuid == '':
Expand All @@ -373,7 +373,7 @@ def get_app_uuid(ceate_new_uuid=False):
if uuid_key in config[g_app_name]:
g_app_uuid = config[g_app_name][uuid_key]

if ceate_new_uuid or g_app_uuid == '':
if g_app_uuid == '':
# Create a UUID if it does not exist
_uuid = str(uuid.uuid4())
config.set(g_app_name, uuid_key, _uuid)
Expand All @@ -389,7 +389,7 @@ def get_app_uuid(ceate_new_uuid=False):


# Setup all the globals based on the OS and the sdk_settings.ini file.
def init(ceate_new_uuid):
def init():
global g_python_cmd
global g_app_name
global g_dev_client_ip
Expand Down Expand Up @@ -425,6 +425,9 @@ def init(ceate_new_uuid):
success = False
print('ERROR 1: The {} key does not exist in {}'.format(app_key, settings_file))

if g_app_name == '':
print('The app_name key is empty in {}'.format(settings_file))

if ip_key in config[sdk_key]:
g_dev_client_ip = config[sdk_key][ip_key]
else:
Expand All @@ -447,7 +450,7 @@ def init(ceate_new_uuid):
print('ERROR 5: The {} section does not exist in {}'.format(sdk_key, settings_file))

# This will also create a UUID if needed.
get_app_uuid(ceate_new_uuid)
get_app_uuid()

return success

Expand All @@ -463,8 +466,10 @@ def init(ceate_new_uuid):
if len(sys.argv) > 2:
option = str(sys.argv[2]).lower()

if not init(ceate_new_uuid=utility_name == 'uuid'):
sys.exit(0)
if utility_name in ['clean', 'package', 'build', 'uuid', 'status', 'install', 'start', 'stop', 'uninstall', 'purge']:
# Load the settings from the sdk_settings.ini file.
if not init():
sys.exit(0)

if utility_name == 'clean':
if option == 'all':
Expand Down
Loading