Skip to content

Commit d70f2c0

Browse files
Merge pull request openSUSE#693 from dirkmueller/whitespace
Whitespace cleanup
2 parents 7d1cd5c + c6f76bb commit d70f2c0

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

Diff for: .github/workflows/linux.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16+
with:
17+
fetch-depth: 0
1618

1719
- name: Install libyaml-libyaml-perl
1820
run: |

Diff for: Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ all:
2424
.PHONY: test test-debtransform doc
2525

2626
test:
27+
[ "$(SCM)" != "git" ] || git --no-pager diff --check origin/master..HEAD --
2728
PERL5LIB=. prove -v
2829

2930
test-debtransform:

Diff for: build-recipe-docker

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
################################################################
66
#
77
# Copyright (c) 2017 SUSE Linux Products GmbH
8+
# Copyright (c) 2021 SUSE LLC
89
#
910
# This program is free software; you can redistribute it and/or modify
1011
# it under the terms of the GNU General Public License version 2 or 3 as
@@ -28,15 +29,15 @@ recipe_setup_docker() {
2829
TOPDIR="/usr/src/packages"
2930
test "$DO_INIT_TOPDIR" != false && rm -Rf "$BUILD_ROOT/$TOPDIR"
3031
mkdir -p "$BUILD_ROOT$TOPDIR/SOURCES"
31-
if test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir ; then
32+
if test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir ; then
3233
mv "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
3334
else
3435
if test -z "$LINKSOURCES" ; then
3536
copy_sources "$MYSRCDIR" "$BUILD_ROOT$TOPDIR/SOURCES/"
3637
else
3738
cp -lR "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
3839
fi
39-
if test "$?" != 0 ; then
40+
if test "$?" != 0 ; then
4041
cleanup_and_exit 1 "source copy failed"
4142
fi
4243
fi
@@ -186,7 +187,7 @@ recipe_build_docker() {
186187
if ! $DOCKER_CMD save --output "$TOPDIR/DOCKER/$FILENAME.tar" "$FIRSTTAG" ; then
187188
cleanup_and_exit 1 "$DOCKER_TOOL save command failed"
188189
fi
189-
190+
190191
# Create containerinfo
191192
args=()
192193
test -n "$DISTURL" && args=("${args[@]}" --disturl "$DISTURL")

0 commit comments

Comments
 (0)