From 1cd9e72e9cd7d9cc0f38d56875415ca30f2f9caf Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 29 Jul 2014 14:22:54 +0200 Subject: [PATCH] fix rebuildpacs by giving an error if osc doesn't return XML --- create_test_dvds.sh | 2 +- rebuildpacs.pl | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/create_test_dvds.sh b/create_test_dvds.sh index 8f95b9ad..6ea3b2f8 100644 --- a/create_test_dvds.sh +++ b/create_test_dvds.sh @@ -73,7 +73,7 @@ for l in B C D E F G H I J; do regenerate_pl "openSUSE:Factory:Staging:$l" 1 "staging_$l-bc" staging_$l done -projects=$(osc api /search/project/id?match='starts-with(@name,"openSUSE:Factory:Staging")' | grep :DVD | cut -d\" -f2) +projects=$(osc api /search/project/id?match='starts-with(@name,"openSUSE:Factory:Staging")' | grep :DVD | cut -d\' -f2) for prj in openSUSE:Factory:Rings:2-TestDVD $projects; do perl $SCRIPTDIR/rebuildpacs.pl $prj standard x86_64 done diff --git a/rebuildpacs.pl b/rebuildpacs.pl index df4b0dbd..ae14bece 100755 --- a/rebuildpacs.pl +++ b/rebuildpacs.pl @@ -202,7 +202,11 @@ sub get_paths($$$) { my $package = find_package_in_project($project); open(OSC, "osc api /build/$project/$repo/$arch/$package/_buildinfo|"); - my $xml = XMLin(join('', ), ForceArray => 1); + my $xml = join('', ); + if ($xml !~ m/^ 1); close(OSC); return $xml->{path};