From a6bae43d2035c74056cc8ba29d034dacc2baddae Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Fri, 14 Jul 2023 11:40:13 +0200 Subject: [PATCH] Fix whitespace No spaces before tabs please --- Build/Expand.pm | 4 ++-- PBuild/Preset.pm | 2 +- build-recipe-appimage | 4 ++-- build-recipe-docker | 2 +- initvm.c | 4 ++-- pbuild | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Build/Expand.pm b/Build/Expand.pm index 83ac51be5..abf2cd17a 100644 --- a/Build/Expand.pm +++ b/Build/Expand.pm @@ -699,7 +699,7 @@ sub expand { for my $q (@q) { for my $rs (@{$pkgsupplements->{$q} || []}) { if ($rs =~ /^\(.*\)$/) { - my $rd = Build::Rpm::parse_rich_dep($rs); + my $rd = Build::Rpm::parse_rich_dep($rs); next if !$rd || fulfilled_cplx_rec($config, \%p, $rd); } else { next unless grep {$p{$_}} @{$whatprovides->{$rs} || Build::addproviders($config, $rs)}; @@ -791,7 +791,7 @@ sub expand { for my $r (splice @native) { next if $rdone{$r}++; if ($r eq '--directdepsend--') { - push @native, $r; + push @native, $r; next; } my @q = @{$whatprovides->{$r} || Build::addproviders($config, $r)}; diff --git a/PBuild/Preset.pm b/PBuild/Preset.pm index 86e75d7db..b423deb9b 100644 --- a/PBuild/Preset.pm +++ b/PBuild/Preset.pm @@ -29,7 +29,7 @@ my $dtd_pbuild = [ 'pbuild' => [[ 'preset' => 'name', - 'default', + 'default', 'arch', [ 'config' ], [ 'repo' ], diff --git a/build-recipe-appimage b/build-recipe-appimage index 5633d81b4..1e8597b8e 100644 --- a/build-recipe-appimage +++ b/build-recipe-appimage @@ -68,14 +68,14 @@ recipe_build_appimage() { if test "$DO_INIT" = true; then if test -n "$DEB" -a ! -d "$BUILD_ROOT/.build.binaries/dists" ; then - echo "creating debian repository metadata..." + echo "creating debian repository metadata..." createrepo_debian $BUILD_ROOT/.build.binaries ${ARCH} ${DIST} # setup /etc/apt/sources.list mkdir -p "$BUILD_ROOT/etc/apt" echo "deb [trusted=yes] file:/.build.binaries OBS main" >> "$BUILD_ROOT/etc/apt/sources.list" fi if test -z "$DEB" -a ! -d "$BUILD_ROOT/.build.binaries/repodata" ; then - echo "creating repository metadata..." + echo "creating repository metadata..." if chroot "$BUILD_ROOT" test -x /usr/bin/createrepo_c; then chroot "$BUILD_ROOT" /usr/bin/createrepo_c /.build.binaries elif chroot "$BUILD_ROOT" test -x /usr/bin/createrepo; then diff --git a/build-recipe-docker b/build-recipe-docker index 1e5995004..2d0e19634 100644 --- a/build-recipe-docker +++ b/build-recipe-docker @@ -312,7 +312,7 @@ recipe_build_docker() { for format in $(queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" buildflags+ sbom | sort -u) ; do echo "Generating $format sbom file" generate_sbom --format "$format" "$TOPDIR/DOCKER/$FILENAME.tar" > "$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.${format/cyclonedx/cdx}.json" - test -s "$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.${format/cyclonedx/cdx}.json" || rm -f "$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.${format/cyclonedx/cdx}.json" + test -s "$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.${format/cyclonedx/cdx}.json" || rm -f "$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.${format/cyclonedx/cdx}.json" done # We're done. Clean up. diff --git a/initvm.c b/initvm.c index 574d7f0d4..ff3703dfe 100644 --- a/initvm.c +++ b/initvm.c @@ -20,7 +20,7 @@ * * AUTHOR * Copyright (c) 2012 James Perkins - * Adrian Schroeter + * Adrian Schroeter * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 or 3 as @@ -49,7 +49,7 @@ /* to enable debugging, compile with -DDEBUG */ #ifdef DEBUG -#define DBG(x) do { x; } while(0) +#define DBG(x) do { x; } while(0) #else #define DBG(x) #endif diff --git a/pbuild b/pbuild index 93bd03acf..2bcac876c 100755 --- a/pbuild +++ b/pbuild @@ -201,7 +201,7 @@ if (!@{($bconf_host || $bconf)->{'preinstall'} || []}) { print("Preset $preset->{'name'} does not contain a build setup definition.\n"); print("Please specify a distribution with the --dist option.\n"); exit; - } + } my @presetnames = PBuild::Preset::known_presets($dir); if (@presetnames) { print("Please specify a distribution or a preset!\n\n");