diff --git a/dist/ci/obs_testsuite_travis_install.sh b/dist/ci/obs_testsuite_travis_install.sh index 85238dbd17a650839b2ff582fea723935fa29967..f9ecadaeb4f08179033b21477b5a8e9adacc38c4 100755 --- a/dist/ci/obs_testsuite_travis_install.sh +++ b/dist/ci/obs_testsuite_travis_install.sh @@ -8,7 +8,7 @@ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C5C219E7 # Install updates from our own repository sudo chmod a+w /etc/apt/sources.list.d -echo 'deb http://download.opensuse.org/repositories/OBS:/Server:/Unstable/xUbuntu_12.04 /' > /etc/apt/sources.list.d/opensuse.list +echo 'deb http://download.opensuse.org/repositories/OBS:/Server:/2.7/xUbuntu_12.04 /' > /etc/apt/sources.list.d/opensuse.list # We could use this to only update the package list from the OBS, # but apprently this is not possible anymore. So we update all package lists. diff --git a/src/api/app/models/package.rb b/src/api/app/models/package.rb index 99b024a82e70b4f0d71726fdf1c979a76172de94..4451ccbb631bfa8011d2ac5586d39a9995083537 100644 --- a/src/api/app/models/package.rb +++ b/src/api/app/models/package.rb @@ -1344,22 +1344,23 @@ class Package < ActiveRecord::Base self end + #### WARNING: these operations run in build object, not this package object def rebuild(params) - backend_build_command(:rebuild, params.slice(:package, :arch, :repository)) + backend_build_command(:rebuild, params[:project], params.slice(:package, :arch, :repository)) end def wipe_binaries(params) - backend_build_command(:wipe, params.slice(:package, :arch, :repository)) + backend_build_command(:wipe, params[:project], params.slice(:package, :arch, :repository)) end def abort_build(params) - backend_build_command(:abortbuild, params.slice(:package, :arch, :repository)) + backend_build_command(:abortbuild, params[:project], params.slice(:package, :arch, :repository)) end - def backend_build_command(command, params) + def backend_build_command(command, build_project, params) begin - Suse::Backend.post("/build/#{URI.escape(project.name)}?cmd=#{command}&#{params.to_query}", '') - rescue ActiveXML::Transport::Error, Timeout::Error => e + Suse::Backend.post("/build/#{URI.escape(build_project)}?cmd=#{command}&#{params.to_query}", '') + rescue ActiveXML::Transport::Error, Timeout::Error, Project::WritePermissionError => e errors.add(:base, e.message) return false end