Skip to content

Commit

Permalink
Fix whitespace
Browse files Browse the repository at this point in the history
No spaces before tabs please
  • Loading branch information
mlschroe committed Jul 14, 2023
1 parent 978b67a commit a6bae43
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Build/Expand.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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)};
Expand Down Expand Up @@ -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)};
Expand Down
2 changes: 1 addition & 1 deletion PBuild/Preset.pm
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ my $dtd_pbuild = [
'pbuild' =>
[[ 'preset' =>
'name',
'default',
'default',
'arch',
[ 'config' ],
[ 'repo' ],
Expand Down
4 changes: 2 additions & 2 deletions build-recipe-appimage
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-recipe-docker
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions initvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* AUTHOR
* Copyright (c) 2012 James Perkins <[email protected]>
* Adrian Schroeter <[email protected]>
* Adrian Schroeter <[email protected]>
*
* 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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit a6bae43

Please sign in to comment.