[Pkg-privacy-commits] [torbrowser-launcher] 167/476: load_settings() now always makes sure tbl_version is the latest

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository torbrowser-launcher.

commit 77643091fe2eeae6899763e8ff317e84314514a0
Author: Micah Lee <micah at micahflee.com>
Date:   Sat Nov 9 17:28:18 2013 -0800

    load_settings() now always makes sure tbl_version is the latest
---
 torbrowser-launcher | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/torbrowser-launcher b/torbrowser-launcher
index e810f6e..8e730b2 100755
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -270,7 +270,6 @@ class TBLCommon:
                 print '0.0.1 migration'
                 self.settings = default_settings
                 self.settings['installed_version']['alpha'] = settings['installed_version']
-                self.settings['tbl_version'] = self.tbl_version
                 resave = True
 
                 # move tbb alpha
@@ -281,6 +280,11 @@ class TBLCommon:
                 if setting not in settings:
                     settings[setting] = default_settings[setting]
                     resave = True
+
+            # make sure the version is current
+            if settings['tbl_version'] != self.tbl_version:
+                settings['tbl_version'] = self.tbl_version
+                resave = True
             
             self.settings = settings
             if resave:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git