summaryrefslogtreecommitdiff
path: root/Build.pm
diff options
context:
space:
mode:
authorAdrian Schröter <adrian@suse.de>2008-04-07 17:39:57 +0000
committerAdrian Schröter <adrian@suse.de>2008-04-07 17:39:57 +0000
commit841e019c48b8f5a65ebd888914346f7fc87f12c0 (patch)
tree29138ee73d32dc7ca087c8bf9c3ca457a2285f9f /Build.pm
parent57a7e425d78e2f59b8b4600e4efc875e3040e7b0 (diff)
downloadobs-build-841e019c48b8f5a65ebd888914346f7fc87f12c0.tar.gz
obs-build-841e019c48b8f5a65ebd888914346f7fc87f12c0.tar.bz2
obs-build-841e019c48b8f5a65ebd888914346f7fc87f12c0.zip
revert "use_ignore", handle this in OBS code instead.
Diffstat (limited to 'Build.pm')
-rw-r--r--Build.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/Build.pm b/Build.pm
index 0af0f90..105997d 100644
--- a/Build.pm
+++ b/Build.pm
@@ -102,8 +102,6 @@ sub read_config_dist {
sub read_config {
my ($arch, $cfile) = @_;
-# FIXME: make this an option
- my $use_ignore = 0;
my @macros = split("\n", $std_macros.$extra_macros);
push @macros, "%define _target_cpu $arch";
push @macros, "%define _target_os linux";
@@ -168,7 +166,7 @@ sub read_config {
next;
}
if ($l0 eq 'preinstall:' || $l0 eq 'vminstall:' || $l0 eq 'required:' || $l0 eq 'support:' || $l0 eq 'keep:' || $l0 eq 'prefer:' || $l0 eq 'ignore:' || $l0 eq 'conflict:' || $l0 eq 'runscripts:') {
- next if ( $l0 eq 'ignore:' && $use_ignore == 0 );
+ next if ( $l0 eq 'ignore:' );
my $t = substr($l0, 0, -1);
for my $l (@l) {
if ($l eq '!*') {