[Pkg-privacy-commits] [torbrowser-launcher] 31/59: Read the version number from ChangeLog.txt

[Roger Shimizu]

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

rosh pushed a commit to branch debian/sid
in repository torbrowser-launcher.

commit 1425d79f888e8572a5eede6131b8ae52a813aaf0
Author: Matt Kraai <kraai at ftbfs.org>
Date:   Wed Jan 24 18:44:44 2018 -0800

    Read the version number from ChangeLog.txt
    
    Fixes #306
---
 torbrowser_launcher/common.py   | 2 +-
 torbrowser_launcher/launcher.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
index f260058..effbf40 100644
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
@@ -173,10 +173,10 @@ class Common:
                 'version_check_url': 'https://aus1.torproject.org/torbrowser/update_3/release/Linux_x86_64-gcc3/x/en-US',
                 'version_check_file': tbb_cache+'/download/release.xml',
                 'tbb': {
+                    'changelog': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Browser/TorBrowser/Docs/ChangeLog.txt',
                     'dir': tbb_local+'/tbb/'+self.architecture,
                     'dir_tbb': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language,
                     'start': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/start-tor-browser.desktop',
-                    'versions': tbb_local+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Browser/TorBrowser/Docs/sources/versions',
                 },
             }
 
diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
index 061ebb3..45a607c 100644
--- a/torbrowser_launcher/launcher.py
+++ b/torbrowser_launcher/launcher.py
@@ -600,9 +600,9 @@ class Launcher:
 
     def check_min_version(self):
         installed_version = None
-        for line in open(self.common.paths['tbb']['versions']).readlines():
-            if line.startswith('TORBROWSER_VERSION='):
-                installed_version = line.split('=')[1].strip()
+        for line in open(self.common.paths['tbb']['changelog']).readlines():
+            if line.startswith('Tor Browser '):
+                installed_version = line.split()[2]
                 break
 
         if self.min_version <= installed_version:

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