Merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master

[Marco Trevisan (Treviño)]

[Didier Roche-Tolomelli (didrocks)]

Let's just use getenv which is better for this IMHO. I'm adding also a missing import sys.

review: Disapprove

Unmerged commits

c24429f... by Marco Trevisan (Treviño) on 2018-09-06

migration: Skip if DESKTOP_SESSION is not exported

Fixes LP: #1790532

diff --git a/debian/changelog b/debian/changelog
index 88be35d..b072519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnome-session (3.30.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/ubuntu-settings-migrate-to-defaults.18.10.0.py:
+    - Skip the settings migrations even if DESKTOP_SESSION is not
+      exported (LP: #1790532)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Thu, 06 Sep 2018 15:11:53 +0200
+
 gnome-session (3.30.0-0ubuntu1) cosmic; urgency=medium
 
   * New upstream release:
diff --git a/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py b/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py
index 3fdf000..4220c83 100755
--- a/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py
+++ b/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py
@@ -32,7 +32,7 @@ OLD_DEFAULTS = {
     }
 }
 
-if os.environ['DESKTOP_SESSION'] != 'ubuntu':
+if 'DESKTOP_SESSION' not in os.environ or os.environ['DESKTOP_SESSION'] != 'ubuntu':
     sys.exit(0)
 
 any_changed = False