From a6c6fd2a2752b515a39b1e56e93fd1ac221792c6d6f1452e458ed6e097b66d6b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 20 Dec 2011 10:52:28 +0000 Subject: [PATCH] Accepting request 97166 from home:WernerFink:branches:Base:System - ignore empty rpm as in 09-check-packaged-twice as those will be detected by rpmlint rules with a clear message OBS-URL: https://build.opensuse.org/request/show/97166 OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=60 --- new.diff | 6 ++++-- post-build-checks.changes | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/new.diff b/new.diff index 372c7dc..1e53a1c 100644 --- a/new.diff +++ b/new.diff @@ -1,8 +1,8 @@ Index: post-build-checks-1.0/checks/09-check-packaged-twice =================================================================== --- post-build-checks-1.0.orig/checks/09-check-packaged-twice 2011-10-20 11:57:54.000000000 +0200 -+++ post-build-checks-1.0/checks/09-check-packaged-twice 2011-12-07 10:59:53.350691785 +0100 -@@ -1,61 +1,74 @@ ++++ post-build-checks-1.0/checks/09-check-packaged-twice 2011-12-20 10:12:34.056044906 +0000 +@@ -1,61 +1,76 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w # search for files packaged more than once @@ -64,6 +64,8 @@ Index: post-build-checks-1.0/checks/09-check-packaged-twice + my @files = ; + chomp @files; + close FILES; ++ # ignore empty rpm as rpmlint will catch them ++ @files = grep {!/^\(none\)/} @files; + # ignore dirs + @files = grep {!/^d/} @files; + for my $file (@files) { diff --git a/post-build-checks.changes b/post-build-checks.changes index 74b90d6..6a92523 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 20 10:14:40 UTC 2011 - werner@suse.de + +- ignore empty rpm as in 09-check-packaged-twice as those will be + detected by rpmlint rules with a clear message + ------------------------------------------------------------------- Wed Dec 7 10:00:08 UTC 2011 - coolo@suse.com