Rev 555: Fix license path finding. in file:///data/jelmer/bzr-gtk/trunk/

Jelmer Vernooij jelmer at samba.org
Fri Jul 18 21:12:55 BST 2008


At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 555
revision-id: jelmer at samba.org-20080718201254-phkice8vdvr2svvm
parent: jelmer at samba.org-20080718200112-zh96tadh9o103vru
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-07-18 22:12:54 +0200
message:
  Fix license path finding.
modified:
  about.py                       about.py-20070715145104-2ihlkw9xgrwj7i3d-1
=== modified file 'about.py'
--- a/about.py	2008-07-04 08:05:17 +0000
+++ b/about.py	2008-07-18 20:12:54 +0000
@@ -33,7 +33,7 @@
 def read_license():
     license_paths = [data_path("COPYING"), "/usr/share/common-licenses/GPL-2"]
     for license_file in license_paths:
-        if os.path.exists(license_file):
+        if license_file is not None and os.path.exists(license_file):
             return file(license_file).read()
     # Fall back to just license name if we can't find the file
     return "GPLv2 or later"




More information about the bazaar-commits mailing list