Hello community,
here is the log from the commit of package osc-source_validator for
openSUSE:Factory
checked in at Mon Aug 22 10:53:31 CEST 2011.
--------
--- osc-source_validator/osc-source_validator.changes 2011-08-11
16:57:13.000000000 +0200
+++
/mounts/work_src_done/STABLE/osc-source_validator/osc-source_validator.changes
2011-08-19 15:10:10.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 19 15:09:27 CEST 2011 - [email protected]
+
+- Handle properly situations where variables or conditionis are used
+ with syntax like "%if 0%{?some_var}" or just "%{?some_var}"
+ (thanks to "kad" for this fix)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ osc-source_validator.spec ++++++
--- /var/tmp/diff_new_pack.mCoOTw/_old 2011-08-22 10:43:00.000000000 +0200
+++ /var/tmp/diff_new_pack.mCoOTw/_new 2011-08-22 10:43:00.000000000 +0200
@@ -19,7 +19,7 @@
Name: osc-source_validator
Version: 0.1
-Release: 22
+Release: 24
License: GPLv2+
Summary: osc source validator
Url:
http://en.opensuse.org/openSUSE:Build_Service_Tools#OSC_source_validator
++++++ osc-source_validator-0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/osc-source_validator-0.1/helpers/output_versions
new/osc-source_validator-0.1/helpers/output_versions
--- old/osc-source_validator-0.1/helpers/output_versions 2011-08-11
16:55:14.000000000 +0200
+++ new/osc-source_validator-0.1/helpers/output_versions 2011-08-17
16:11:54.000000000 +0200
@@ -78,7 +78,8 @@
if ( /^\s*%if/ || /^\s*%\{/ || /^\s*%define/ || /^\s*%el/ ||
/^\s*%endif/ ) {
if ( /^\s*%if\s/ ) {
my @args = split (/\s+/,$_);
- $_ =~ s/[\{\}\"]//g for (@args);
+ $_ =~ s/[\?\{\}\"]//g for (@args);
+ $_ =~ s/^0%/%/ for (@args);
$ifhandler->{"last_if_disabled"} = 0;
$ifhandler->{"last_if_if"} = 1;
$ifhandler->{"depth"}++;
@@ -115,7 +116,7 @@
}
} elsif ( /^\s*%define\s/ ) {
my @args = split (/\s+/,$_);
- $_ =~ s/[\{\}\"]//g for (@args);
+ $_ =~ s/[\?\{\}\"]//g for (@args);
$args[2] =~ s/\Q$_\E/$definelist->{$_}/g for (sort { length($b)
<=> length($a) } keys (%{$definelist}));
if ( $args[2] !~ /[\(\)\{\}\@\%\"\\]/ ) {
$definelist->{"%".$args[1]} = $args[2] if
$ifhandler->{"disabled"} == 0;
@@ -130,7 +131,7 @@
next unless $ifhandler->{"disabled"} == 0;
next if $main_package_name;
my @args = split (/\s+/,$_);
- $_ =~ s/[\{\}\"]//g for (@args);
+ $_ =~ s/[\?\{\}\"]//g for (@args);
$args[1] =~ s/\Q$_\E/$definelist->{$_}/ for (sort { length($b)
<=> length($a) } keys (%{$definelist}));
$current_package = $args[1];
$package_name = $current_package;
@@ -162,7 +163,7 @@
}
$package_version = "";
my @args = split (/\s+/,$_);
- $_ =~ s/[\{\}\"]//g for (@args);
+ $_ =~ s/[\?\{\}\"]//g for (@args);
if ($args[1] =~ /^-n/) {
#warn "trying on ".join(",",(keys
(%{$definelist})))."\n" if $debug;
$args[2] =~ s/\Q$_\E/$definelist->{$_}/ for (sort {
length($b) <=> length($a) } keys (%{$definelist}));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
