From cc574be8cff4ca919418d06782ed9341ed6390e6 Mon Sep 17 00:00:00 2001 From: Yigang Wen Date: Thu, 15 May 2014 18:43:15 +0800 Subject: [PATCH] apply pattern.xml in the end of build Fixes: #1879 Change-Id: Ifa5abae0a1cbd659633c877616c0e6ccbd2b3f6f Signed-off-by: Yigang Wen --- depanneur | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/depanneur b/depanneur index 9f2d4d3..c6b24cd 100755 --- a/depanneur +++ b/depanneur @@ -946,10 +946,6 @@ sub createrepo $extra_opts = $extra_opts . " --update " if ( -e "$localrepo/$dist/$arch/repodata" ); $extra_opts = $extra_opts . " --groupfile=$groupfile " if ( -e "$groupfile"); my_system ("createrepo $extra_opts $localrepo/$dist/$arch > /dev/null 2>&1 ") == 0 or die "createrepo failed: $?\n"; - if ( -e $patternfile ) { - my_system("rm $localrepo/$dist/$arch/repodata/*patterns.xml.gz -f"); - my_system("modifyrepo $patternfile $localrepo/$dist/$arch/repodata >/dev/null"); - } } @@ -1513,6 +1509,17 @@ sub update_repo createrepo ($arch, $dist); } + my @package_group_rpm = glob("$rpm_repo_path/package-groups-[0-9]*.rpm"); + my $tmp_dir = abs_path(tempdir(CLEANUP=>1)); + if ( @package_group_rpm != 0 and -e $package_group_rpm[0] ) { + my_system("cd $tmp_dir; rpm2cpio $package_group_rpm[0] | cpio -di "); + ( $patternfile ) = glob("$tmp_dir/*/*/*/patterns.xml"); + } + if ( -e $patternfile ) { + my_system("rm $localrepo/$dist/$arch/repodata/*patterns.xml.gz -f"); + my_system("modifyrepo $patternfile $localrepo/$dist/$arch/repodata >/dev/null"); + } + } sub build_html_report -- 2.34.1