yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checking meta instead of hardcode project letter to identify use_bc

Browse Source
This commit is contained in:
Max Lin 2016-05-25 14:00:51 +08:00
parent 279a545186
commit 8f8f9d5f53
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
create_test_dvds.sh
View File

@ -136,9 +136,9 @@ function start_creating() {
if [ "$has_ring_2" = "yes" ]; then if [ "$has_ring_2" = "yes" ]; then
sync_prj openSUSE:$target:Rings:2-TestDVD/standard $target-testdvd-$arch $arch sync_prj openSUSE:$target:Rings:2-TestDVD/standard $target-testdvd-$arch $arch
regenerate_pl openSUSE:$target:Rings:2-TestDVD $target 2 $target-bootstrap-$arch $target-minimalx-$arch $target-testdvd-$arch $arch regenerate_pl openSUSE:$target:Rings:2-TestDVD $target 2 $target-bootstrap-$arch $target-minimalx-$arch $target-testdvd-$arch $arch
if [ "$dryrun" != 'yes' ]; then if [ "$dryrun" != 'yes' ]; then
perl $SCRIPTDIR/rebuildpacs.pl openSUSE:$target:Rings:2-TestDVD standard $arch perl $SCRIPTDIR/rebuildpacs.pl openSUSE:$target:Rings:2-TestDVD standard $arch
fi fi
fi fi
# Staging Project part # Staging Project part
@ -147,28 +147,28 @@ function start_creating() {
for prj in $projects; do for prj in $projects; do
l=$(echo $prj | sed 's/^openSUSE.\+[:]Staging/Staging/g' | cut -d: -f2) l=$(echo $prj | sed 's/^openSUSE.\+[:]Staging/Staging/g' | cut -d: -f2)
use_bc="staging_$target:$l-bc-$arch"
if [ "$l" = "A" -o "$l" = "B" ]; then
use_bc=
fi
# special case for Gcc6
if [ "$l" = "Gcc6" ]; then
use_bc=
fi
if [[ $prj =~ ^openSUSE.+:[A-Z]$ ]] || [[ $prj =~ ^openSUSE.+:Gcc6$ ]]; then if [[ $prj =~ ^openSUSE.+:[A-Z]$ ]] || [[ $prj =~ ^openSUSE.+:Gcc6$ ]]; then
echo "Checking $target:$l-$arch" echo "Checking $target:$l-$arch"
meta=$(mktemp)
use_bc="staging_$target:$l-bc-$arch"
osc meta prj $prj > $meta
if grep -q 0-Bootstrap $meta ; then
use_bc=
fi
if [ -n "$use_bc" ]; then if [ -n "$use_bc" ]; then
sync_prj openSUSE:$target:Staging:$l/bootstrap_copy "staging_$target:$l-bc-$arch" $arch sync_prj openSUSE:$target:Staging:$l/bootstrap_copy "staging_$target:$l-bc-$arch" $arch
fi fi
sync_prj openSUSE:$target:Staging:$l/standard staging_$target:$l-$arch $arch sync_prj openSUSE:$target:Staging:$l/standard staging_$target:$l-$arch $arch
regenerate_pl "openSUSE:$target:Staging:$l" $target 1 $use_bc staging_$target:$l-$arch $arch regenerate_pl "openSUSE:$target:Staging:$l" $target 1 $use_bc staging_$target:$l-$arch $arch
rm $meta
fi fi
if [[ $prj =~ :DVD ]]; then if [[ $prj =~ :DVD ]]; then
echo "Rebuildpacs $prj" echo "Rebuildpacs $prj"
if [ "$dryrun" != 'yes' ]; then if [ "$dryrun" != 'yes' ]; then
perl $SCRIPTDIR/rebuildpacs.pl $prj standard $arch perl $SCRIPTDIR/rebuildpacs.pl $prj standard $arch
fi fi
fi fi
if [[ $prj =~ ^openSUSE.+:[A-Z]:DVD$ ]]; then if [[ $prj =~ ^openSUSE.+:[A-Z]:DVD$ ]]; then