Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1790532 in gnome-session (Ubuntu):
"ubuntu-settings-migrate-to-defaults.18.10.0.py crashed with KeyError in
__getitem__(): 'DESKTOP_SESSION'"
https://bugs.launchpad.net/ubuntu/+source/gnome-session/+bug/1790532
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/354394
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 88be35d..e50bac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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)
+ * debian
+
+ -- Marco Trevisan (Treviño) <ma...@ubuntu.com> 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
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
