[backend] silly, silly, silly, but silent

openSUSE · Dec 14, 2011 · 322412a · 322412a
1 parent dfb5c2d
commit 322412a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/backend/bs_dispatch b/src/backend/bs_dispatch
@@ -61,7 +61,7 @@ if ($BSConfig::powerpkgs) {
   }
 }
 
-BSUtil::set_fdatasync_before_rename() unless $BSConfig::disable_data_sync;
+BSUtil::set_fdatasync_before_rename() unless $BSConfig::disable_data_sync || $BSConfig::disable_data_sync;
 
 my $bsdir = $BSConfig::bsdir || "/srv/obs";
 

diff --git a/src/backend/bs_publish b/src/backend/bs_publish
@@ -47,9 +47,9 @@ use BSNotify;
 
 use strict;
 
-BSUtil::drop_privs_to($BSConfig::bsuser, $BSConfig::bsgroup);
+BSUtil::drop_privs_to($BSConfig::bsuser||$BSConfig::bsuser, $BSConfig::bsgroup||$BSConfig::bsgroup);
 
-BSUtil::set_fdatasync_before_rename() unless $BSConfig::disable_data_sync;
+BSUtil::set_fdatasync_before_rename() unless $BSConfig::disable_data_sync || $BSConfig::disable_data_sync;
 
 my $reporoot = "$BSConfig::bsdir/build";
 my $eventdir = "$BSConfig::bsdir/events";

diff --git a/src/backend/bs_repserver b/src/backend/bs_repserver
@@ -72,7 +72,7 @@ $port = $1 if $BSConfig::reposerver =~ /:(\d+)$/;
 my $proxy;
 $proxy = $BSConfig::proxy if defined($BSConfig::proxy);
 
-BSUtil::set_fdatasync_before_rename() unless $BSConfig::disable_data_sync;
+BSUtil::set_fdatasync_before_rename() unless $BSConfig::disable_data_sync || $BSConfig::disable_data_sync;
 
 my $historylay = [qw{versrel bcnt srcmd5 rev time}];
 
@@ -1044,7 +1044,7 @@ sub workerstate {
     unlink("$workersdir/building/$idlename");
 
     # make sure that we can connect to the client
-    if ($BSConfig::checkclientconnectivity) {
+    if ($BSConfig::checkclientconnectivity || $BSConfig::checkclientconnectivity) {
       my $param = {
 	'uri' => "http://$peerip:$peerport/status",
         'async' => 1,

diff --git a/src/backend/bs_service b/src/backend/bs_service
@@ -50,9 +50,9 @@ use strict;
 undef $BSConfig::bsuser;	# need to stay root
 undef $BSConfig::bsgroup;
 
-BSUtil::set_fdatasync_before_rename() unless $BSConfig::disable_data_sync;
+BSUtil::set_fdatasync_before_rename() unless $BSConfig::disable_data_sync || $BSConfig::disable_data_sync;
 
-my $tempdir = $BSConfig::servicetempdir || "/var/tmp";
+my $tempdir = $BSConfig::servicetempdir || $BSConfig::servicetempdir || "/var/tmp";
 my $port = 5152;
 $port = $1 if $BSConfig::serviceserver =~ /:(\d+)$/;
 my $silent;

diff --git a/src/backend/bs_signer b/src/backend/bs_signer
@@ -262,7 +262,7 @@ sub signjob {
   my @signfiles = grep {/\.(?:d?rpm|sha256|iso)$/} @files;
   if (@signfiles) {
     my @signargs;
-    push @signargs, '--project', $projid if $BSConfig::sign_project;
+    push @signargs, '--project', $projid if $BSConfig::sign_project || $BSConfig::sign_project;
     my $param = {
       'uri' => "$BSConfig::srcserver/getsignkey",
       'timeout' => 60,

diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver
@@ -64,7 +64,7 @@ $port = $1 if $BSConfig::srcserver =~ /:(\d+)$/;
 my $proxy;
 $proxy = $BSConfig::proxy if defined($BSConfig::proxy);
 
-BSUtil::set_fdatasync_before_rename() unless $BSConfig::disable_data_sync;
+BSUtil::set_fdatasync_before_rename() unless $BSConfig::disable_data_sync || $BSConfig::disable_data_sync;
 
 my $projectsdir = "$BSConfig::bsdir/projects";
 my $eventdir = "$BSConfig::bsdir/events";