Very simple patch that lets us look in a couple more places for the
GPLv2 license text and the credits pickle.
Cheers,
Jelmer
--
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: lp:bzr-gtk
# testament_sha1: a366f535a5b9fab8aa0ec7391b9012299ce5d0a6
# timestamp: 2008-07-04 10:05:39 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file '__init__.py'
--- __init__.py 2008-06-27 17:10:27 +0000
+++ __init__.py 2008-07-04 08:05:17 +0000
@@ -103,21 +103,24 @@
bzrlib.ui.ui_factory = GtkUIFactory()
-def data_path():
- return os.path.dirname(__file__)
-
-
-def icon_path(*args):
- basedirs = [os.path.join(data_path()),
+def data_basedirs():
+ return [os.path.dirname(__file__),
"/usr/share/bzr-gtk",
"/usr/local/share/bzr-gtk"]
- for basedir in basedirs:
- path = os.path.join(basedir, 'icons', *args)
+
+
+def data_path(*args):
+ for basedir in data_basedirs():
+ path = os.path.join(basedir, *args)
if os.path.exists(path):
return path
return None
+def icon_path(*args):
+ return data_path(os.path.join('icons', *args))
+
+
def open_display():
pygtk = import_pygtk()
try:
=== modified file 'about.py'
--- about.py 2008-06-28 20:24:16 +0000
+++ about.py 2008-07-04 08:05:17 +0000
@@ -27,13 +27,14 @@
from bzrlib.errors import NotBranchError, NoRepositoryPresent
from bzrlib.trace import mutter
-from bzrlib.plugins.gtk import icon_path
+from bzrlib.plugins.gtk import data_path, icon_path
def read_license():
- license_file = os.path.join(os.path.dirname(__file__), "COPYING")
- if os.path.exists(license_file):
- return file(license_file).read()
+ license_paths = [data_path("COPYING"), "/usr/share/common-licenses/GPL-2"]
+ for license_file in license_paths:
+ if 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"
@@ -41,7 +42,7 @@
def load_credits():
import pickle
try:
- credits = pickle.load(file("credits.pickle"))
+ credits = pickle.load(file(data_path("credits.pickle")))
except IOError:
credits = None
return credits
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQazvR4AAlBfgERQUff//1q1
xSq////wUAT417oOhzs7UZdY6CSKCZGFTPKn6jYjUmymfqo2k8pkAZGgMCShNNT0p+ptFGh6nqaa
AAyAAAAAMSamST1PSb1I9ExNAAAA0DTTRoAc0ZMTABMRgRpgQYjBMmARgkkBDQCCYCp+VNij9SYM
RGEaMhppByAja1tedmMXI+CGam9gFTbHVUwgjUcKgjFYo1Y3oBMlRpCnG86a6laVNF0kGRAn51ML
57xYEkAkc3odDySSVaLOJu5Ftw11lOMtGBaOKvLD3h65mSmoina9dH9NONFUowc6pxghheygcwB1
mO3NcNiZzrj0e0r6ckwXxXeV7aBZE+8r74ReuOICt08Woo32k29Br+dSeKTqhxI2eiyh79gYIXQ7
zKfADs3p2xs4jMZ7xJ6PC71MMW3KSgmp4nO1F3LrnEYttGVjRaRkBasR83eMQAtHRAwNJYDzRFOS
HkzaA5CuHKMTWPNpcOO/wdkipNvhXZbAi8bOblJlovTid8p5wPcsyMlAdaYg/IxYcBArPLXAwdYs
SRiPMVPO+jkBVaQCk3V6l+ac60g6OkysIoyLzMYvJVMxQ0WklWMf6A5SIuNZQ7rpXtCVBDLQSKXM
RJlJqEqz4BicSGF8L4txVT0qWVqdBy3EFUIpwDCJZWY2FSuLx1gMOA5DAyrZ7EDNMVQI8IWDFwrx
gNwHmU8JXTsAxaCEzFj86igPJHpHWPwK0IrMh5LiXay+RaTuNOhiDBdI4kj9L72YoUKiBYSJQwKx
59jtXaxKSrtYGXEH4KtEeBu9ZtInrQwH61xILgViSuFtsIbPkOO80JQEU0KQTpwSAQyu3tT8v8Z8
+T4ssihLsAt2HI9a5BQYoaxYsQ0CmHHt7Z7mWW0SyHkF2HMSpeVVbZVb6B6jWjscS4gpDVoxKC/o
KB8l+KUBL13PNQx+RMmJegt37yomTOpgtdXcL+GXYVkfa4Op4nMcYngf9qS8ji7FvUxbstXq6yFr
L4lgaDpEznIBICkN0dEoRI/MbV1npKzOtk/lqOdU5j4MiF6h9Q9bIoYyW00mPPgO9ErXnEWSXePi
ZWYZpg9DSeWBO8eD1xy3+E20/78BKpL7qMXHKWWRCVPjqC2LoM6lWcFrnRFapWoyKjcbSMvWZd5v
hByAzhhvHUeywS717UodfUSB/tOkC5gbAVLUdVpKIrAbYaNYDWZGg8MgORE5wxW493JCiVg89gEP
FE8rF6ufSFmxBNHeg46U9Zvia9nQ+vA8GPIcDHBczx6b2MfHYh5eYBgtrAzCpqNh0v8oUENyS44V
dGylTiCNJXc3oMQNUw2bBSE8juIsEAEQGmaA4P9Qwuozk8JghIFHexdZpAE5pox7yatknG4PqkRo
NCOQSdXES+NmDdIFfBVx37toc/OwsAYmqwfUz79tlg2zouNQuvC3c3J75uQEEZxJ7lk8XQ+2Hn0m
TJ9BKYW13LlFaFjLfwq1hEnIZiWkf92O2Bz5jpBOEgg+TOGa8+4lIWIcnMVaxVoGmAIq3XTVBFLI
zpWYs3HkFkBqVjZXBKIloQUIFbVIyD96D2eSYHYJ56eit2wqvWq9dgFqsVEFu3qMqDe0jh8ANr0S
L5ic5uuuil3f+LuSKcKEgDWd6PA=
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
