From 12f867757bba0dd016293f0f9c02a58b0d6cdacb Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Tue, 10 Apr 2012 07:30:21 +0200 Subject: [PATCH] repositories: Prefer gpg2 over gpg --- weboob/applications/weboobrepos/weboobrepos.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/weboob/applications/weboobrepos/weboobrepos.py b/weboob/applications/weboobrepos/weboobrepos.py index a2c995f7..55b89f05 100644 --- a/weboob/applications/weboobrepos/weboobrepos.py +++ b/weboob/applications/weboobrepos/weboobrepos.py @@ -207,9 +207,10 @@ class WeboobRepos(ReplApplication): return os.getenv('GPG_EXECUTABLE') paths = os.getenv('PATH', os.defpath).split(os.pathsep) for path in paths: - fpath = os.path.join(path, 'gpg') - if os.path.exists(fpath) and os.access(fpath, os.X_OK): - return fpath + for ex in ('gpg2', 'gpg'): + fpath = os.path.join(path, ex) + if os.path.exists(fpath) and os.access(fpath, os.X_OK): + return fpath def _archive_excludes(self, filename): # Skip *.pyc files in tarballs.