summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Drung <bdrung@debian.org>2013-12-21 22:31:52 +0100
committerBenjamin Drung <bdrung@debian.org>2013-12-21 23:21:47 +0100
commit0fb7746c58beded61943e7ac3389ee815a9c33df (patch)
tree8601026c517c393dc83520740f0d0a61325b243a
parenta716a3b8de40d74fb2c9be1fa8a6db9beee5591b (diff)
dh_xul-ext: Treat Raspbian as Debian derivative
Use "dpkg-vendor --derives-from Ubuntu" instead of "dpkg-vendor --query vendor" so Ubuntu derivatives get treated like Ubuntu and non-Ubuntu based Debian derivatives get treated like Debian. Thanks: Peter Michael Green <plugwash@raspbian.org> Closes: #732254
-rwxr-xr-xdh_xul-ext9
1 files changed, 6 insertions, 3 deletions
diff --git a/dh_xul-ext b/dh_xul-ext
index 418feb8..7226ce6 100755
--- a/dh_xul-ext
+++ b/dh_xul-ext
@@ -125,9 +125,12 @@ def get_vendor():
if _VENDOR_ENV in os.environ:
vendor = os.environ[_VENDOR_ENV]
else:
- cmd = ["dpkg-vendor", "--query", "Vendor"]
- process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
- vendor = process.communicate()[0].strip()
+ cmd = ["dpkg-vendor", "--derives-from", "Ubuntu"]
+ retval = subprocess.call(cmd);
+ if retval == 0:
+ vendor = "Ubuntu"
+ else:
+ vendor = "Debian"
return vendor
def get_xul_apps(script_name, all_distros):