aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop/convert_user_regdates.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-08-16 17:31:22 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-08-16 17:31:22 +0000
commitc261dfa420a45dc76c18797ccacd68dfb5d95b0a (patch)
treef70547e75c09c4fbe266d2fb810a6113c57a07a4 /phpBB/develop/convert_user_regdates.php
parent65805038b7c30ccc190d86356b5b3bec682878b0 (diff)
downloadforums-c261dfa420a45dc76c18797ccacd68dfb5d95b0a.tar
forums-c261dfa420a45dc76c18797ccacd68dfb5d95b0a.tar.gz
forums-c261dfa420a45dc76c18797ccacd68dfb5d95b0a.tar.bz2
forums-c261dfa420a45dc76c18797ccacd68dfb5d95b0a.tar.xz
forums-c261dfa420a45dc76c18797ccacd68dfb5d95b0a.zip
damn it, wrong table for now ...
git-svn-id: file:///svn/phpbb/trunk@2864 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/develop/convert_user_regdates.php')
0 files changed, 0 insertions, 0 deletions
kg.pm14
-rwxr-xr-xrpmdrake6
2 files changed, 14 insertions, 6 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 9edccd86..ff37d59d 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -56,13 +56,25 @@ our @EXPORT = qw(
get_pkgs
perform_installation
perform_removal
- run_rpm);
+ run_rpm
+ sort_packages
+ );
use mygtk2 qw(gtknew);
use ugtk2 qw(:all);
our $priority_up_alread_warned;
+sub sort_packages_biarch {
+ my ($x64, $other) = partition { !/86$/ } @_;
+ (sort { uc($a) cmp uc($b) } @$x64), sort { uc($a) cmp uc($b) } @$other;
+}
+
+sub sort_packages_monoarch {
+ sort { uc($a) cmp uc($b) } @_;
+}
+
+*sort_packages = arch() =~ /x86_64/ ? \&sort_packages_biarch : \&sort_packages_monoarch;
sub run_rpm {
foreach (qw(LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL)) {
diff --git a/rpmdrake b/rpmdrake
index 256ad840..2f3419a7 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -195,11 +195,7 @@ sub do_search($$$$$$$) {
my $iter;
if (@search_results) {
- my $f = arch() =~ /x86_64/ ? sub {
- my ($x64, $other) = partition { !/86$/ } @_;
- (sort { uc($a) cmp uc($b) } @$x64), sort { uc($a) cmp uc($b) } @$other;
- } : sub { sort { uc($a) cmp uc($b) } @_ };
- @search_results = $f->(@search_results);
+ @search_results = sort_packages(@search_results);
$elems{$results_ok} = [ map { [ $_, $results_ok ] } @search_results ];
$iter = $options->{add_parent}->($results_ok);
$options->{add_nodes}->(map { [ $_, $results_ok . ($options->{tree_mode} eq 'by_presence'