Skip to content

Commit 335e19a

Browse files
committed
branch2obs: disable also Leap 16.1, not only Leap 16.0
1 parent 2f6e499 commit 335e19a

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

devel/branch2obs.sh

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ usage () {
1212
echo " -p <project> - target OBS project"
1313
echo " (default: systemsmanagement:Agama:branches:\$BRANCH"
1414
echo " or systemsmanagement:Agama:Devel for master)"
15-
echo " -t - keep all original build targets (default: disable Leap 16.0)"
15+
echo " -t - keep all original build targets (default: disable Leap 16.x)"
1616
echo
1717
echo " -c - cleanup (delete) all obsolete projects, exclusive option,"
1818
echo " all other options are ignored"
@@ -203,10 +203,17 @@ else
203203
osc meta prj --file - "$PROJECT"
204204
fi
205205

206-
# disable Leap 16.0 target
206+
# disable Leap 16.x targets
207207
if [ "$ALL_TARGETS" != true ]; then
208-
echo "Disabling openSUSE Leap 16.0 build target"
209-
ADD='<build> <disable repository="openSUSE_Leap_16.0"/> <disable repository="images_Leap_16.0"/> </build>'
208+
echo "Disabling openSUSE Leap 16.x build targets"
209+
ADD='<build>
210+
<disable repository="openSUSE_Leap_16.1"/>
211+
<disable repository="openSUSE_Leap_16.0"/>
212+
<disable repository="images_Leap_16.1"/>
213+
<disable repository="images_Leap_16.0"/>
214+
</build>'
215+
# remove newlines to fit into a sed command
216+
ADD="$(echo "$ADD" | tr '\n' ' ')"
210217
osc meta prj "$PROJECT" | \
211218
sed "s#</description>#</description>$ADD#" | \
212219
osc meta prj --file - "$PROJECT"
@@ -270,3 +277,4 @@ fi
270277

271278
echo
272279
echo "Git branch \"$BRANCH\" is now automatically submitted to OBS project \"$PROJECT\""
280+
echo " xdg-open https://build.opensuse.org/project/show/$PROJECT"

0 commit comments

Comments
 (0)