spacewalk/admin/rhn-config-schema.pl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 477c94ac530486ca1ab57c74ed9b3f58673a8f39
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Sep 9 11:50:29 2010 +0200
Add back support for old Spacewalk schema sources, needed for Satellite schema upgrade testing.
diff --git a/spacewalk/admin/rhn-config-schema.pl b/spacewalk/admin/rhn-config-schema.pl
index 104093e..ea76eb6 100755
--- a/spacewalk/admin/rhn-config-schema.pl
+++ b/spacewalk/admin/rhn-config-schema.pl
@@ -69,13 +69,17 @@ while (@exception_queue) {
}
}
-my $marker_re = qr/^-- Source: (.+?)$/;
+my $marker_re = qr/^-- Source: (.+?)$|^select '(.+?)' sql_file from dual;$/;
my $line;
my %exception_seen;
while ($line = <SOURCE>) {
if ($line =~ $marker_re) {
my $filename = $1;
+ if (not defined $filename) {
+ $filename = $2;
+ $filename =~ s!^.+/([^/]+/[^/]+)$!$1!;
+ }
if (exists $exception_files{$filename}) {
open OVERRIDE, "$exception_dir/$filename" or die "Error reading file [$exception_dir/$filename]: $!\n";
$exception_seen{$filename}++;