fix rebuildpacs by giving an error if osc doesn't return XML

openSUSE · Jul 29, 2014 · 1cd9e72 · 1cd9e72
1 parent 3cfad49
commit 1cd9e72
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -202,7 +202,11 @@ ($$$)
   my $package = find_package_in_project($project);
 
   open(OSC, "osc api /build/$project/$repo/$arch/$package/_buildinfo|");
-  my $xml = XMLin(join('', <OSC>), ForceArray => 1);
+  my $xml = join('', <OSC>);
+  if ($xml !~ m/^</) {
+     die "failed to open /build/$project/$repo/$arch/$package/_buildinfo"; 
+  }
+  $xml = XMLin($xml, ForceArray => 1);
   close(OSC);
 
   return $xml->{path};