Commit 22fdbd40 authored by Joerg Bruehe's avatar Joerg Bruehe

Test "file_contents" failed in non-community RPMs on SuSE

because the search pattern for the "INFO_*" files was not general enough:
Fixed.
parent 68147625
...@@ -15,9 +15,9 @@ if ($dir_bin =~ m|/usr/|) { ...@@ -15,9 +15,9 @@ if ($dir_bin =~ m|/usr/|) {
# RPM package # RPM package
$dir_docs = $dir_bin; $dir_docs = $dir_bin;
$dir_docs =~ s|/lib|/share/doc|; $dir_docs =~ s|/lib|/share/doc|;
if(-d "$dir_docs/packages/MySQL-server") { if(-d "$dir_docs/packages") {
# SuSE # SuSE: "packages/" in the documentation path
$dir_docs = "$dir_docs/packages/MySQL-server"; $dir_docs = glob "$dir_docs/packages/MySQL-server*";
} else { } else {
# RedHat: version number in directory name # RedHat: version number in directory name
$dir_docs = glob "$dir_docs/MySQL-server*"; $dir_docs = glob "$dir_docs/MySQL-server*";
...@@ -25,9 +25,9 @@ if ($dir_bin =~ m|/usr/|) { ...@@ -25,9 +25,9 @@ if ($dir_bin =~ m|/usr/|) {
} elsif ($dir_bin =~ m|/usr$|) { } elsif ($dir_bin =~ m|/usr$|) {
# RPM build during development # RPM build during development
$dir_docs = "$dir_bin/share/doc"; $dir_docs = "$dir_bin/share/doc";
if(-d "$dir_docs/packages/MySQL-server") { if(-d "$dir_docs/packages") {
# SuSE # SuSE: "packages/" in the documentation path
$dir_docs = "$dir_docs/packages/MySQL-server"; $dir_docs = glob "$dir_docs/packages/MySQL-server*";
} else { } else {
# RedHat: version number in directory name # RedHat: version number in directory name
$dir_docs = glob "$dir_docs/MySQL-server*"; $dir_docs = glob "$dir_docs/MySQL-server*";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment