This enables osc to speedup "osc up" in a project working copy (in some cases) (by using the getprojectsourceinfo route). --- src/backend/bs_srcserver | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver index 11f9d8c..0536426 100755 --- a/src/backend/bs_srcserver +++ b/src/backend/bs_srcserver @@ -7602,14 +7602,14 @@ sub sourceinfo { } my $linkinfo = {}; $files = lsrev($rev, $linkinfo); - if ($linkinfo->{'xservicemd5'}) { + if ($linkinfo->{'xservicemd5'} && !$cgi->{'noservice'}) { $files = handleservice($rev, $files, $linkinfo->{'xservicemd5'}); $r->{'srcmd5'} = $rev->{'srcmd5'}; } my $meta = ''; $meta .= "$files->{$_} $_\n" for sort keys %$files; $r->{'verifymd5'} = Digest::MD5::md5_hex($meta); - die("source update running\n") if $files->{'_service'} && -e "$eventdir/service/${projid}::$packid"; + die("source update running\n") if $files->{'_service'} && -e "$eventdir/service/${projid}::$packid" && !$cgi->{'noservice'}; die("source update failed\n") if $files->{'_service_error'}; }; $r->{'originproject'} = $rev->{'originproject'} if $rev && $rev->{'originproject'}; @@ -7855,7 +7855,7 @@ my $dispatches = [ 'POST:/source/$project cmd=undelete user:? comment:?' => \&undeleteproject, 'POST:/source/$project cmd=copy user:? comment:? oproject:project withbinaries:bool? withhistory:bool? makeolder:bool? resign:bool? noservice:bool?' => \©project, 'POST:/source/$project cmd: *:*' => \&unknowncmd, - '/source/$project view=info parse:bool? nofilename:bool? repository? arch? package* withchangesmd5:bool?' => \&getprojectsourceinfo, + '/source/$project view=info parse:bool? nofilename:bool? repository? arch? package* withchangesmd5:bool? noservice:bool?' => \&getprojectsourceinfo, '/source/$project deleted:bool? expand:bool? noorigins:bool?' => \&getpackagelist, 'DELETE:/source/$project user:? comment:? requestid:num?' => \&delproject, @@ -7887,7 +7887,7 @@ my $dispatches = [ 'PUT:/source/$project/$package cmd: rev? user:? comment:?' => \&sourcecommitfilelist, # obsolete - '/source/$project/$package view=info rev? linkrev? parse:bool? nofilename:bool? repository? arch? withchangesmd5:bool?' => \&getpackagesourceinfo, + '/source/$project/$package view=info rev? linkrev? parse:bool? nofilename:bool? repository? arch? withchangesmd5:bool? noservice:bool?' => \&getpackagesourceinfo, '/source/$project/$package rev? linkrev? emptylink:bool? deleted:bool? expand:bool? view:? extension:? lastworking:bool? withlinked:bool? meta:bool? product:?' => \&getfilelist, '/source/$project/$package/_history rev? meta:bool? deleted:bool? limit:num?' => \&getpackagehistory, '/source/$project/$package/_meta rev? expand:bool? meta:bool? deleted:bool?' => \&getpackage, -- 1.7.3.4 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org