From dd74d84d29ac3ce822d6c140154091cd76d43c20 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Mon, 15 Dec 2008 18:31:57 +0000 Subject: [PATCH] Better check for Debian-style distribution Check for '/var/lib/dpkg/status', not just '/var/lib/dpkg' (reported by Markus Rathgeb). --- zeroinstall/injector/distro.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zeroinstall/injector/distro.py b/zeroinstall/injector/distro.py index e41154b..2852ad6 100644 --- a/zeroinstall/injector/distro.py +++ b/zeroinstall/injector/distro.py @@ -45,8 +45,8 @@ class Distribution(object): class DebianDistribution(Distribution): """An dpkg-based distribution.""" - def __init__(self, db_dir): - self.status_details = os.stat(db_dir + '/status') + def __init__(self, db_status_file): + self.status_details = os.stat(db_status_file) self.versions = {} self.cache_dir = basedir.save_cache_path(namespaces.config_site, namespaces.config_prog) @@ -249,11 +249,11 @@ def get_host_distribution(): @rtype: L{Distribution}""" global _host_distribution if not _host_distribution: - _dpkg_db_dir = '/var/lib/dpkg' + _dpkg_db_status = '/var/lib/dpkg/status' _rpm_db = '/var/lib/rpm/Packages' - if os.access(_dpkg_db_dir, os.R_OK | os.X_OK): - _host_distribution = DebianDistribution(_dpkg_db_dir) + if os.access(_dpkg_db_status, os.R_OK): + _host_distribution = DebianDistribution(_dpkg_db_status) elif os.path.isfile(_rpm_db): _host_distribution = RPMDistribution(_rpm_db) else: -- 2.11.4.GIT