scripts: Do not use sort directly on the return keyword

Fixes Subroutines::ProhibitReturnSort.

Warned-by: perlcritic

9 files changed, 22 insertions, 10 deletions

diff --git a/scripts/Dpkg/BuildEnv.pm b/scripts/Dpkg/BuildEnv.pm
index 511ba24ab..a69d35233 100644
--- a/scripts/Dpkg/BuildEnv.pm
+++ b/scripts/Dpkg/BuildEnv.pm
@@ -85,7 +85,8 @@ Returns a list of all environment variables that have been accessed.
 =cut
 
 sub list_accessed {
-    return sort keys %env_accessed;
+    my @list = sort keys %env_accessed;
+    return @list;
 }
 
 =item my @list = $bf->list_modified()
@@ -95,7 +96,8 @@ Returns a list of all environment variables that have been modified.
 =cut
 
 sub list_modified {
-    return sort keys %env_modified;
+    my @list = sort keys %env_modified;
+    return @list;
 }
 
 =back
diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm
index e2e48d203..934ae948f 100644
--- a/scripts/Dpkg/BuildFlags.pm
+++ b/scripts/Dpkg/BuildFlags.pm
@@ -415,7 +415,8 @@ Returns the list of flags stored in the object.
 
 sub list {
     my ($self) = @_;
-    return sort keys %{$self->{'flags'}};
+    my @list = sort keys %{$self->{'flags'}};
+    return @list;
 }
 
 =back
diff --git a/scripts/Dpkg/Checksums.pm b/scripts/Dpkg/Checksums.pm
index 1d4e14140..1f18be021 100644
--- a/scripts/Dpkg/Checksums.pm
+++ b/scripts/Dpkg/Checksums.pm
@@ -70,7 +70,8 @@ Returns the list of supported checksums algorithms.
 =cut
 
 sub checksums_get_list() {
-    return sort keys %{$CHECKSUMS};
+    my @list = sort keys %{$CHECKSUMS};
+    return @list;
 }
 
 =item $bool = checksums_is_supported($alg)
diff --git a/scripts/Dpkg/Compression.pm b/scripts/Dpkg/Compression.pm
index 322cb5ff3..323315017 100644
--- a/scripts/Dpkg/Compression.pm
+++ b/scripts/Dpkg/Compression.pm
@@ -102,7 +102,8 @@ Returns a list of supported compression methods (sorted alphabetically).
 =cut
 
 sub compression_get_list {
-    return sort keys %$COMP;
+    my @list = sort keys %$COMP;
+    return @list;
 }
 
 =item compression_is_supported($comp)
diff --git a/scripts/Dpkg/Control/Fields.pm b/scripts/Dpkg/Control/Fields.pm
index 56ae2f126..b3c61f9cc 100644
--- a/scripts/Dpkg/Control/Fields.pm
+++ b/scripts/Dpkg/Control/Fields.pm
@@ -512,12 +512,13 @@ Debian package.
 =cut
 
 sub field_list_src_dep() {
-    return sort {
+    my @list = sort {
         $FIELDS{$a}{'dep_order'} <=> $FIELDS{$b}{'dep_order'}
     } grep {
         field_is_allowed_in($_, CTRL_PKG_SRC) and
         exists $FIELDS{$_}{'dependency'}
     } keys %FIELDS;
+    return @list;
 }
 
 =item field_list_pkg_dep()
@@ -530,12 +531,13 @@ the stronger to the weaker.
 
 sub field_list_pkg_dep() {
     my @keys = keys %FIELDS;
-    return sort {
+    my @list = sort {
         $FIELDS{$a}{'dep_order'} <=> $FIELDS{$b}{'dep_order'}
     } grep {
         field_is_allowed_in($_, CTRL_PKG_DEB) and
         exists $FIELDS{$_}{'dependency'}
     } @keys;
+    return @list;
 }
 
 =item field_get_dep_type($field)
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 1021d9e80..9a164ccf8 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -738,7 +738,8 @@ sub get_unknown_binaries {
 
 sub get_seen_binaries {
     my ($self) = @_;
-    return sort keys %{$self->{'seen_binaries'}};
+    my @seen = sort keys %{$self->{'seen_binaries'}};
+    return @seen;
 }
 
 1;
diff --git a/src/t/100_dpkg_divert.t b/src/t/100_dpkg_divert.t
index 311557c2f..765fa40c3 100644
--- a/src/t/100_dpkg_divert.t
+++ b/src/t/100_dpkg_divert.t
@@ -128,8 +128,9 @@ sub diversions_pack {
     for (my ($i) = 0; $i < $#data; $i += 3) {
         push @data_packed, [ @data[$i .. $i + 2] ];
     }
+    my @list = sort { $a->[0] cmp $b->[0] } @data_packed;
 
-    return sort { $a->[0] cmp $b->[0] } @data_packed;
+    return @list;
 }
 
 sub diversions_eq {
diff --git a/test/100_critic.t b/test/100_critic.t
index 3e91080f2..cae188f0b 100644
--- a/test/100_critic.t
+++ b/test/100_critic.t
@@ -63,6 +63,7 @@ my @policies = qw(
     Modules::RequireFilenameMatchesPackage
     Subroutines::ProhibitExplicitReturnUndef
     Subroutines::ProhibitNestedSubs
+    Subroutines::ProhibitReturnSort
     TestingAndDebugging::ProhibitNoStrict
     TestingAndDebugging::ProhibitNoWarnings
     TestingAndDebugging::RequireUseStrict
diff --git a/utils/t/100_update_alternatives.t b/utils/t/100_update_alternatives.t
index 69683a81d..7b1e17766 100644
--- a/utils/t/100_update_alternatives.t
+++ b/utils/t/100_update_alternatives.t
@@ -190,7 +190,9 @@ sub get_slaves_status {
 	    }
 	}
     }
-    return sort { $a->{name} cmp $b->{name} } values %slaves;
+    my @slaves = sort { $a->{name} cmp $b->{name} } values %slaves;
+
+    return @slaves;
 }
 
 sub check_link {