diff mbox series

[layerindex-web] Set default settings module and import from django.conf

Message ID 20251010184435.68264-1-piotr@qbee.io
State New
Headers show
Series [layerindex-web] Set default settings module and import from django.conf | expand

Commit Message

Piotr Buliński Oct. 10, 2025, 6:44 p.m. UTC 
- Replace `os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'` with
  `os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")`
  to avoid overwriting an existing settings module if already defined.
- Change `import settings` to `from django.conf import settings`
  for proper use of Django’s settings registry

Signed-off-by: Piotr Buliński <piotr@qbee.io>
---
 layerindex/recipedesc.py          | 2 +-
 layerindex/tools/import_layers.py | 2 +-
 layerindex/utils.py               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/layerindex/recipedesc.py b/layerindex/recipedesc.py
index 33aef31..8cbdcf0 100644
--- a/layerindex/recipedesc.py
+++ b/layerindex/recipedesc.py
@@ -31,7 +31,7 @@  def main():
     # Get access to our Django model
     newpath = os.path.abspath(os.path.dirname(os.path.abspath(sys.argv[0])) + '/..')
     sys.path.append(newpath)
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
     from django.core.management import setup_environ
     from django.conf import settings
diff --git a/layerindex/tools/import_layers.py b/layerindex/tools/import_layers.py
index 57b0f86..9696362 100755
--- a/layerindex/tools/import_layers.py
+++ b/layerindex/tools/import_layers.py
@@ -61,7 +61,7 @@  def main():
         loglevel = logging.INFO
 
     utils.setup_django()
-    import settings
+    from django.conf import settings
     from layerindex.models import Branch, LayerItem, LayerBranch, LayerDependency, LayerMaintainer, LayerNote, Recipe, Source, Patch, PackageConfig, StaticBuildDep, DynamicBuildDep, RecipeFileDependency, Machine, Distro, BBClass, BBAppend, IncFile
     from django.db import transaction
 
diff --git a/layerindex/utils.py b/layerindex/utils.py
index 8bbd621..66e4994 100644
--- a/layerindex/utils.py
+++ b/layerindex/utils.py
@@ -400,7 +400,7 @@  def setup_django():
     # Get access to our Django model
     newpath = os.path.abspath(os.path.dirname(__file__) + '/..')
     sys.path.append(newpath)
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
     django.setup()
 
 def logger_create(name):