[Rt-commit] rt branch, dont_squish_one_time_recipients, created. rt-3.8.7-353-gd10b128
Ruslan Zakirov
ruz at bestpractical.com
Tue Apr 20 19:27:30 EDT 2010
The branch, dont_squish_one_time_recipients has been created
at d10b128ed7f2ecd44396329d8f6cffe1d7962dc6 (commit)
- Log -----------------------------------------------------------------
commit e9196ba4a751ff72dbeae2c1877d7319f0c1fb1a
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Apr 16 07:18:45 2010 +0800
shouldn't use the loocalized $key in query
diff --git a/share/html/Search/Elements/Chart b/share/html/Search/Elements/Chart
index 4355006..4693c9d 100644
--- a/share/html/Search/Elements/Chart
+++ b/share/html/Search/Elements/Chart
@@ -120,7 +120,7 @@ my $query_string = $m->comp('/Elements/QueryString', %ARGS);
% && $key ne loc('(no value)') ) {
% my $group = $PrimaryGroupBy; $group =~ s! !.!;
% my $QueryString = $m->comp('/Elements/QueryString',
-% Query => "$Query and $group = '$key'",
+% Query => "$Query and $group = '${{ reverse %loc_keys }}{$key}'",
% Format => $ARGS{Format},
% Rows => $ARGS{Rows},
% OrderBy => $ARGS{OrderBy},
commit 5c0379626a5c428673809d8f542b6c6457059b2e
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Apr 16 07:39:22 2010 +0800
found an unused debug code by chance
diff --git a/lib/RT/Report/Tickets/Entry.pm b/lib/RT/Report/Tickets/Entry.pm
index 525fb98..78e4cab 100644
--- a/lib/RT/Report/Tickets/Entry.pm
+++ b/lib/RT/Report/Tickets/Entry.pm
@@ -65,8 +65,6 @@ sub LabelValue {
my $field = shift;
my $value = $self->__Value( $field );
- $RT::Logger->error("boo: $value");
-
if ( $field =~ /(Daily|Monthly|Annually|Hourly)$/ ) {
my $re;
# it's not just 1970-01-01 00:00:00 because of timezone shifts
commit 2f14eaa97ace8ac3e323006ff47d40974321deb4
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Apr 16 07:46:17 2010 +0800
${{}}{} is so too ugly
diff --git a/share/html/Search/Elements/Chart b/share/html/Search/Elements/Chart
index 4693c9d..bf4cd0c 100644
--- a/share/html/Search/Elements/Chart
+++ b/share/html/Search/Elements/Chart
@@ -119,8 +119,9 @@ my $query_string = $m->comp('/Elements/QueryString', %ARGS);
% if ( $PrimaryGroupBy !~ /(Hourly|Daily|Monthly|Annually)$/
% && $key ne loc('(no value)') ) {
% my $group = $PrimaryGroupBy; $group =~ s! !.!;
+% my %orig_keys = reverse %loc_keys;
% my $QueryString = $m->comp('/Elements/QueryString',
-% Query => "$Query and $group = '${{ reverse %loc_keys }}{$key}'",
+% Query => "$Query and $group = '$orig_keys{$key}'",
% Format => $ARGS{Format},
% Rows => $ARGS{Rows},
% OrderBy => $ARGS{OrderBy},
commit 5fc7de4b1c8d4d5e03b96d140a7e228f5f7fc485
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Wed Feb 24 16:51:47 2010 -0500
Fix 3 bugs
Switch to ' from " so the shell stops trying to expand !
Switch from modperl[12] to modperl1|modperl2 because configure tries to
expand [] for us
Make sure WEB_HANDLER is available to the perl one liner
diff --git a/configure.ac b/configure.ac
index 7e6d757..731c2fd 100755
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_ARG_WITH(web-handler,
]),
WEB_HANDLER=$withval,
WEB_HANDLER=fastcgi)
-my_web_handler_test=$($PERL -e "print 'ok' unless grep \$_ !~ /^(modperl[12]|fastcgi(?:-server)?|speedycgi|standalone)\$/i, grep defined && length, split /\s*,\s*/, '$WEB_HANDLER'")
+my_web_handler_test=$($PERL -e 'print "ok" unless grep $_ !~ /^(modperl1|modperl2|fastcgi(?:-server)?|speedycgi|standalone)$/i, grep defined && length, split /\s*,\s*/, $ARGV[0]' $WEB_HANDLER)
if test "$my_web_handler_test" != "ok"; then
AC_MSG_ERROR([Only modperl1, modperl2, fastcgi, fastcgi-server, speedycgi and standalone are valid web-handlers])
fi
commit 61234d10be21f1bc82cdf3c4dc8990bf4ecfaa25
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Wed Apr 21 00:32:17 2010 +0400
return scalar on error unless array wanted
in after fix check we call the function in scalar context
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index f6261fe..937d608 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -439,8 +439,9 @@ sub test_dep {
}
else {
eval "use $module $version ()";
- if ($@) {
- my $error = $@;
+ if ( my $error = $@ ) {
+ return 0 unless wantarray;
+
$error =~ s/\n(.*)$//s;
$error =~ s/at \(eval \d+\) line \d+\.$//;
undef $error unless $error =~ /this is only/;
commit fa170bdc0fa9d742e361f8916994fcd59810a698
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Wed Apr 21 00:33:45 2010 +0400
s/if/unless/ - it was reversed logic
we want to show errors when those are not related to version
check, for example compilation errors
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index 937d608..c7051f4 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -444,7 +444,7 @@ sub test_dep {
$error =~ s/\n(.*)$//s;
$error =~ s/at \(eval \d+\) line \d+\.$//;
- undef $error unless $error =~ /this is only/;
+ undef $error if $error =~ /this is only/;
return ( 0, $error );
}
commit 4d739e5d8b38b360a712a2a4bfd57e0a707963a0
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Wed Apr 21 00:36:11 2010 +0400
don't show version when error is not minimum version check failure
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index c7051f4..1864cf0 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -147,7 +147,8 @@ sub conclude {
for my $name ( keys %$missing ) {
my $module = $missing->{$name};
my $version = $module->{version};
- print_found( $name . ( $version ? " >= $version" : "" ),
+ my $error = $module->{error};
+ print_found( $name . ( $version && !$error ? " >= $version" : "" ),
0, $module->{error} );
}
}
commit 1f0c8c2bce0b46cd20e96190a4d8aedb8111c153
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Wed Apr 21 00:37:19 2010 +0400
third argument "avoid" in test_dep function
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index 1864cf0..b525bc3 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -434,6 +434,7 @@ sub test_deps {
sub test_dep {
my $module = shift;
my $version = shift;
+ my $avoid = shift;
if ( $args{'list-deps'} ) {
print $module, ': ', $version || 0, "\n";
@@ -449,9 +450,16 @@ sub test_dep {
return ( 0, $error );
}
- else {
- return 1;
+
+ if ( $avoid ) {
+ my $version = $module->VERSION;
+ if ( grep $version eq $_, @$avoid ) {
+ return 0 unless wantarray;
+ return (0, "It's known that there are problems with RT and version '$version' of '$module' module. If it's the latest available version of the module then you have to downgrade manually.");
+ }
}
+
+ return 1;
}
}
commit d10b128ed7f2ecd44396329d8f6cffe1d7962dc6
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Wed Apr 21 00:38:22 2010 +0400
pass avoid argument and avoid DBD::Oracle 1.22
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index b525bc3..f003341 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -380,8 +380,11 @@ GD::Graph
GD::Text
.
-if ($args{'download'}) {
+my %AVOID = (
+ 'DBD::Oracle' => [qw(1.22)],
+);
+if ($args{'download'}) {
download_mods();
}
@@ -405,7 +408,8 @@ foreach my $type (sort grep $args{$_}, keys %args) {
if ( $args{'install'} ) {
for my $module (keys %missing) {
resolve_dep($module, $missing{$module}{version});
- delete $missing{$module} if test_dep($module, $missing{$module}{version});
+ delete $missing{$module}
+ if test_dep($module, $missing{$module}{version}, $AVOID{$module});
}
}
@@ -421,8 +425,8 @@ sub test_deps {
while(@deps) {
my $module = shift @deps;
my $version = shift @deps;
- my($test, $error) = test_dep($module, $version);
- my $msg = $module . ($version ? " >= $version" : '');
+ my($test, $error) = test_dep($module, $version, $AVOID{$module});
+ my $msg = $module . ($version && !$error ? " >= $version" : '');
print_found($msg, $test, $error);
$missing{$module} = { version => $version, error => $error } unless $test;
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list