diff options
| author | Julian Andres Klode <jak@debian.org> | 2019-03-15 15:55:43 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2019-03-15 15:55:43 +0000 |
| commit | c028f80a364c03e021b88049151dddf31b657835 (patch) | |
| tree | 596c9279886fbf012330cde46e48d7d025a7564c /vendor | |
| parent | 01b936bea24cee3afd08c6d345ca17d962b3352b (diff) | |
| parent | 0445980feb3099945674c28da3bd8b329a4e2ff1 (diff) | |
Merge branch 'vendor-getinfo' into 'master'
Fix vendor/getinfo on Ubuntu derivatives
See merge request apt-team/apt!55
Diffstat (limited to 'vendor')
| -rwxr-xr-x | vendor/getinfo | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/getinfo b/vendor/getinfo index 37eb74cef..2ef257c90 100755 --- a/vendor/getinfo +++ b/vendor/getinfo @@ -6,7 +6,7 @@ BASEDIR="$(readlink -f "$(dirname $0)")" getcurrent() { # search for an exact match to use the correct sources.list example cd $BASEDIR - DISTROS="$(find . -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2)" + DISTROS="$(find . -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | LC_ALL=C sort)" for DISTRO in $DISTROS; do if dpkg-vendor --is $DISTRO; then echo $DISTRO @@ -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 |