From 1b23d76725f35555f2853ea7f5349651bdade2a4 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 17 May 2012 15:12:25 +0100 Subject: 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 --- git-bz | 10 +++++++--- 1 file 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) -- cgit v1.2.3