October 2011 - Open Build Service Commits

[obs-commits] [PATCH] [backend] bs_repserver: add updateinfo.xml query support
by OBS build-service 31 Oct '11

31 Oct '11

From: Michael Schroeder <mls(a)suse.de> --- src/backend/bs_repserver | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/backend/bs_repserver b/src/backend/bs_repserver index 9c14279..b7d499b 100755 --- a/src/backend/bs_repserver +++ b/src/backend/bs_repserver @@ -752,7 +752,32 @@ sub getbinary_info { my ($cgi, $projid, $repoid, $arch, $path) = @_; my @s = stat($path); die("404 $path: $!\n") unless @s; - my $res = Build::query($path, 'evra' => 1, 'description' => 1); + my $res = Build::query($path, 'evra' => 1, 'description' => 1) || {}; + if (!%$res && $path =~ /\/updateinfo\.xml$/) { + my $updateinfos = readxml($path, $BSXML::updateinfo, 1); + if ($updateinfos && @{$updateinfos->{'update'} || []} == 1) { + my $updateinfo = $updateinfos->{'update'}->[0]; + $res->{'name'} = $updateinfo->{'id'}; + $res->{'version'} = $updateinfo->{'version'}; + $res->{'summary'} = $updateinfo->{'title'}; + $res->{'description'} = $updateinfo->{'description'}; + my $collection = ($updateinfo->{'pkglist'} || {})->{'collection'} || []; + if (@$collection) { + # only look at first collection + for my $package (@{$collection->[0]->{'package'} || []}) { + my $nevr = $package->{'name'}; + $nevr .= ".$package->{'arch'}" if $package->{'arch'}; + if ($package->{'version'}) { + $nevr .= " = "; + $nevr .= "$package->{'epoch'}:" if $package->{'epoch'}; + $nevr .= "$package->{'version'}" if $package->{'version'}; + $nevr .= "-$package->{'release'}" if defined $package->{'release'}; + } + push @{$res->{'provides'}}, $nevr; + } + } + } + } delete $res->{'source'}; delete $res->{'hdrmd5'}; $res->{'mtime'} = $s[9]; -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [backend] bs_repserver: add updateinfo.xml query support
by OBS build-service 31 Oct '11

31 Oct '11

From: Michael Schroeder <mls(a)suse.de> --- src/backend/bs_repserver | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/src/backend/bs_repserver b/src/backend/bs_repserver index 9c14279..b7d499b 100755 --- a/src/backend/bs_repserver +++ b/src/backend/bs_repserver @@ -752,7 +752,32 @@ sub getbinary_info { my ($cgi, $projid, $repoid, $arch, $path) = @_; my @s = stat($path); die("404 $path: $!\n") unless @s; - my $res = Build::query($path, 'evra' => 1, 'description' => 1); + my $res = Build::query($path, 'evra' => 1, 'description' => 1) || {}; + if (!%$res && $path =~ /\/updateinfo\.xml$/) { + my $updateinfos = readxml($path, $BSXML::updateinfo, 1); + if ($updateinfos && @{$updateinfos->{'update'} || []} == 1) { + my $updateinfo = $updateinfos->{'update'}->[0]; + $res->{'name'} = $updateinfo->{'id'}; + $res->{'version'} = $updateinfo->{'version'}; + $res->{'summary'} = $updateinfo->{'title'}; + $res->{'description'} = $updateinfo->{'description'}; + my $collection = ($updateinfo->{'pkglist'} || {})->{'collection'} || []; + if (@$collection) { + # only look at first collection + for my $package (@{$collection->[0]->{'package'} || []}) { + my $nevr = $package->{'name'}; + $nevr .= ".$package->{'arch'}" if $package->{'arch'}; + if ($package->{'version'}) { + $nevr .= " = "; + $nevr .= "$package->{'epoch'}:" if $package->{'epoch'}; + $nevr .= "$package->{'version'}" if $package->{'version'}; + $nevr .= "-$package->{'release'}" if defined $package->{'release'}; + } + push @{$res->{'provides'}}, $nevr; + } + } + } + } delete $res->{'source'}; delete $res->{'hdrmd5'}; $res->{'mtime'} = $s[9]; -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [backend] improve heuristic that sets the 'relase' element in the updateinfo
by OBS build-service 31 Oct '11

31 Oct '11

From: Michael Schroeder <mls(a)suse.de> --- src/backend/bs_sched | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/backend/bs_sched b/src/backend/bs_sched index cb4cace..57168b4 100755 --- a/src/backend/bs_sched +++ b/src/backend/bs_sched @@ -3555,8 +3555,9 @@ sub rebuildpatchinfo { $update->{'id'} = $patchinfo->{'incident'} || $patchinfo->{'name'}; $update->{'title'} = $patchinfo->{'summary'}; $update->{'description'} = $patchinfo->{'description'}; - # XXX + # FIXME: do not guess the release element! $update->{'release'} = $repoid eq 'standard' ? $projid : $repoid; + $update->{'release'} =~ s/_standard$//; $update->{'release'} =~ s/[_:]+/ /g; $update->{'issued'} = { 'date' => $now }; my @references; -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [backend] improve heuristic that sets the 'relase' element in the updateinfo
by OBS build-service 31 Oct '11

31 Oct '11

From: Michael Schroeder <mls(a)suse.de> --- src/backend/bs_sched | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/backend/bs_sched b/src/backend/bs_sched index cb4cace..57168b4 100755 --- a/src/backend/bs_sched +++ b/src/backend/bs_sched @@ -3555,8 +3555,9 @@ sub rebuildpatchinfo { $update->{'id'} = $patchinfo->{'incident'} || $patchinfo->{'name'}; $update->{'title'} = $patchinfo->{'summary'}; $update->{'description'} = $patchinfo->{'description'}; - # XXX + # FIXME: do not guess the release element! $update->{'release'} = $repoid eq 'standard' ? $projid : $repoid; + $update->{'release'} =~ s/_standard$//; $update->{'release'} =~ s/[_:]+/ /g; $update->{'issued'} = { 'date' => $now }; my @references; -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [backend] improve heuristic that sets the 'relase' element in the updateinfo
by OBS build-service 31 Oct '11

31 Oct '11

From: Michael Schroeder <mls(a)suse.de> --- src/backend/bs_sched | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/backend/bs_sched b/src/backend/bs_sched index cb4cace..57168b4 100755 --- a/src/backend/bs_sched +++ b/src/backend/bs_sched @@ -3555,8 +3555,9 @@ sub rebuildpatchinfo { $update->{'id'} = $patchinfo->{'incident'} || $patchinfo->{'name'}; $update->{'title'} = $patchinfo->{'summary'}; $update->{'description'} = $patchinfo->{'description'}; - # XXX + # FIXME: do not guess the release element! $update->{'release'} = $repoid eq 'standard' ? $projid : $repoid; + $update->{'release'} =~ s/_standard$//; $update->{'release'} =~ s/[_:]+/ /g; $update->{'issued'} = { 'date' => $now }; my @references; -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [api] sync test cases with backend changes
by OBS build-service 31 Oct '11

31 Oct '11

From: Adrian Schröter <adrian(a)suse.de> --- src/api/test/functional/source_controller_test.rb | 7 ++----- src/api/test/functional/source_services_test.rb | 4 +--- src/backend/bs_srcserver | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/api/test/functional/source_controller_test.rb b/src/api/test/functional/source_controller_test.rb index 4460c97..c0fb47b 100644 --- a/src/api/test/functional/source_controller_test.rb +++ b/src/api/test/functional/source_controller_test.rb @@ -1669,10 +1669,7 @@ end assert_response :success assert_tag :tag => "revisionlist", :children => { :count => 1 } - delete "/source/home:fred/DELETE" - assert_response :success - -# FIXME2.3: this support needs a rethink in backend +# FIXME: this is not yet supported in backend if $ENABLE_BROKEN_TEST # copy with history post "/source/home:fred/DELETE", :cmd => :copy, :oproject => "home:Iggy", :opackage => "TestPack", :withhistory => "1" @@ -1680,11 +1677,11 @@ if $ENABLE_BROKEN_TEST get "/source/home:fred/DELETE/_history" assert_response :success assert_tag :tag => "revisionlist", :children => { :count => revision } +end # cleanup delete "/source/home:fred/DELETE" assert_response :success -end delete "/source/home:Iggy/TestPack/filename" assert_response :success end diff --git a/src/api/test/functional/source_services_test.rb b/src/api/test/functional/source_services_test.rb index 2329130..4d0c969 100644 --- a/src/api/test/functional/source_services_test.rb +++ b/src/api/test/functional/source_services_test.rb @@ -217,9 +217,7 @@ class SourceServicesTest < ActionController::IntegrationTest wait_for_service( "home:tom", "service2" ) get "/source/home:tom/service2" assert_response :success -# FIXME2.3: use this when switching to new service mode -# assert_tag :tag => "serviceinfo", :attributes => { :code => 'succeeded' } - assert_no_tag :tag => "serviceinfo", :attributes => { :code => 'failed' } + assert_tag :tag => "serviceinfo", :attributes => { :code => 'succeeded' } assert_no_tag :parent => { :tag => "serviceinfo" }, :tag => "error" get "/source/home:tom/service2/_service:set_version:pack.spec?expand=1" assert_response :success diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver index 44ed5da..783a9ac 100755 --- a/src/backend/bs_srcserver +++ b/src/backend/bs_srcserver @@ -6423,7 +6423,7 @@ my $dispatches = [ 'POST:/source/$project/$package cmd=servicediff rev? unified:bool? file:filename* filelimit:num? tarlimit:num? view:?' => \&servicediff, 'POST:/source/$project/$package cmd=commit rev? user:? comment:? keeplink:bool? repairlink:bool? linkrev? setrev:bool? noservice:bool?' => \&sourcecommit, 'POST:/source/$project/$package cmd=commitfilelist rev? user:? comment:? keeplink:bool? repairlink:bool? linkrev? setrev:bool? requestid:num? time:num? version:? vrev:? noservice:bool? servicemark:?' => \&sourcecommitfilelist, - 'POST:/source/$project/$package cmd=copy rev? user:? comment:? orev:rev? oproject:project? opackage:package? expand:bool? keeplink:bool? repairlink:bool? linkrev? setrev:linkrev? olinkrev:linkrev? requestid:num? dontupdatesource:bool? withhistory:bool? noservice:bool?' => \&sourcecopy, + 'POST:/source/$project/$package cmd=copy rev? user:? comment:? orev:rev? oproject:project? opackage:package? expand:bool? keeplink:bool? repairlink:bool? linkrev? setrev:linkrev? olinkrev:linkrev? requestid:num? dontupdatesource:bool? noservice:bool?' => \&sourcecopy, 'POST:/source/$project/$package cmd=branch rev? user:? comment:? orev:rev? oproject:project? opackage:package? olinkrev:linkrev? requestid:num? force:bool? keepcontent:bool?' => \&sourcebranch, 'POST:/source/$project/$package cmd=linktobranch rev? user:? comment:? linkrev?' => \&linktobranch, 'POST:/source/$project/$package cmd=deleteuploadrev' => \&deleteuploadrev, -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [PATCH] [backend] bs_publish: add rpmmd creation hook to add local data
by OBS build-service 31 Oct '11

31 Oct '11

From: Michael Schroeder <mls(a)suse.de> --- src/backend/bs_publish | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/backend/bs_publish b/src/backend/bs_publish index dc7308c..42325fd 100755 --- a/src/backend/bs_publish +++ b/src/backend/bs_publish @@ -379,6 +379,9 @@ sub createrepo_rpmmd { qsystem('repoview', '-f', "-t$repoinfo->{'title'}", $extrep) && print(" repoview failed: $?\n"); } } + if ($BSConfig::createrepo_rpmmd_hook) { + $BSConfig::createrepo_rpmmd_hook->($projid, $repoid, $extrep, \%options); + } if ($BSConfig::sign && -e "$extrep/repodata/repomd.xml") { my @signargs; push @signargs, '--project', $projid if $BSConfig::sign_project; -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] TESTMAIL
by Adrian Schröter 31 Oct '11

31 Oct '11

can I sent real commit mails here ? -- Adrian Schroeter SUSE Linux Products GmbH email: adrian(a)suse.de -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [openSUSE/open-build-service] 5e76c1: Fixed project code url
by Thomas Schmidt 31 Oct '11

31 Oct '11

Branch: refs/heads/2.3 Home: https://github.com/openSUSE/open-build-service Commit: 5e76c1997ae339952140c124e4fb5addd4d19806 https://github.com/openSUSE/open-build-service/commit/5e76c1997ae339952140c… Author: Thomas Schmidt <tschmidt(a)suse.de> Date: 2011-10-31 (Mon, 31 Oct 2011) Changed paths: M README Log Message: ----------- Fixed project code url -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0

[obs-commits] [openSUSE/open-build-service] d3b5e1: [backend] bs_publish: add rpmmd creation hook to a...
by adrian＠suse.de 31 Oct '11

31 Oct '11

Branch: refs/heads/2.3 Home: https://github.com/openSUSE/open-build-service Commit: d3b5e10313461b03896fa20749b25556f0fe4c43 https://github.com/openSUSE/open-build-service/commit/d3b5e10313461b03896fa… Author: Michael Schroeder <mls(a)suse.de> Date: 2011-10-31 (Mon, 31 Oct 2011) Changed paths: M src/backend/bs_publish Log Message: ----------- [backend] bs_publish: add rpmmd creation hook to add local data Commit: c8c32b7675861dd9b59994e0de5c4caa74b3b251 https://github.com/openSUSE/open-build-service/commit/c8c32b7675861dd9b5999… Author: Adrian Schröter <adrian(a)suse.de> Date: 2011-10-31 (Mon, 31 Oct 2011) Changed paths: M src/api/test/functional/source_controller_test.rb M src/api/test/functional/source_services_test.rb M src/backend/bs_srcserver Log Message: ----------- [api] sync test cases with backend changes Compare: https://github.com/openSUSE/open-build-service/compare/3349ebf...c8c32b7 -- To unsubscribe, e-mail: obs-commits+unsubscribe(a)opensuse.org To contact the owner, e-mail: obs-commits+owner(a)opensuse.org

1 0