summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2019-03-15 14:39:40 +0000
committerSimon McVittie <smcv@debian.org>2019-03-15 15:25:43 +0000
commit0445980feb3099945674c28da3bd8b329a4e2ff1 (patch)
tree596c9279886fbf012330cde46e48d7d025a7564c
parente6633f03b2537e10956b38e9b2d5f2ec6809bb7b (diff)
vendor/getinfo: Don't assume that Ubuntu is the last vendor
If your dpkg-vendor configuration in base-files is an Ubuntu derivative, but not exactly Ubuntu, and not an exact match for anything in vendor/, we want to use vendor/ubuntu. Previously we used whatever $DISTRO happened to be at the end of the "for" loop above, but that's undesirable: even if we assume that find(1) returns results in alphabetical order (which is not guaranteed), we wouldn't want to return a non-Ubuntu result if a future apt version happens to have a vendor that sorts later than vendor/ubuntu, for example vendor/zombieos or something. Closes: #924662 Signed-off-by: Simon McVittie <smcv@collabora.com>
-rwxr-xr-xvendor/getinfo2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/getinfo b/vendor/getinfo
index 8830c238f..2ef257c90 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -28,7 +28,7 @@ getcurrent() {
# Do the ubuntu/debian dance we talked about
if dpkg-vendor --derives-from ubuntu; then
- echo $DISTRO
+ echo ubuntu
return 0
fi