summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2012-05-17 15:12:25 +0100
committerOwen W. Taylor <otaylor@fishsoup.net>2012-08-07 12:24:36 -0400
commit1b23d76725f35555f2853ea7f5349651bdade2a4 (patch)
tree5e465988127364dd71f1d37fb5b5bec083ed9a3a
parent1cef6f1875462583e57d1543f313d4b4c585149f (diff)
downloadgit-bz-1b23d76725f35555f2853ea7f5349651bdade2a4.tar.gz
Add support for epiphany 3.6
Cookie jar got migrated from ~/.gnome2/epiphany to ~/.config/epiphany https://bugzilla.gnome.org/show_bug.cgi?id=676241
-rwxr-xr-xgit-bz10
1 files changed, 7 insertions, 3 deletions
diff --git a/git-bz b/git-bz
index 1259d6f..72c3022 100755
--- a/git-bz
+++ b/git-bz
@@ -621,11 +621,15 @@ def get_bugzilla_cookies_galeon(host):
def get_bugzilla_cookies_epy(host):
# epiphany-webkit migrated the cookie db to a different location, but the
# format is the same
- profile_dir = os.path.expanduser('~/.gnome2/epiphany')
+ profile_dir = os.path.expanduser('~/.config/epiphany')
cookies_sqlite = os.path.join(profile_dir, "cookies.sqlite")
if not os.path.exists(cookies_sqlite):
- # try the old location
- cookies_sqlite = os.path.join(profile_dir, "mozilla/epiphany/cookies.sqlite")
+ # try pre-GNOME-3.6 location
+ profile_dir = os.path.expanduser('~/.gnome2/epiphany')
+ cookies_sqlite = os.path.join(profile_dir, "cookies.sqlite")
+ if not os.path.exists(cookies_sqlite):
+ # try the old location
+ cookies_sqlite = os.path.join(profile_dir, "mozilla/epiphany/cookies.sqlite")
if not os.path.exists(cookies_sqlite):
raise CookieError("%s doesn't exist" % cookies_sqlite)