summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHéctor Orón Martínez <hector.oron@collabora.co.uk>2016-02-08 17:19:32 (GMT)
committerHéctor Orón Martínez <hector.oron@collabora.co.uk>2016-02-08 17:19:32 (GMT)
commit34ba805007acb1d929fe4df3cd9425d6f1de6c9a (patch)
tree46cc46a1aeff20d9f65d068c4787d564ba7b0896
parentb2d10ae15a487f8b8b2af0130752cc57857c2df6 (diff)
downloadopen-build-service-34ba805007acb1d929fe4df3cd9425d6f1de6c9a.tar.gz
open-build-service-34ba805007acb1d929fe4df3cd9425d6f1de6c9a.tar.xz
Revert "Allow <buildenv/> item inside <repository/> elements in project meta config"
This reverts commit 51742e097de0d50267e0dcb7326b21b41189c8ae.
-rw-r--r--docs/api/api/obs.rng6
-rw-r--r--src/api/app/models/db_project.rb16
-rw-r--r--src/api/app/models/repository.rb1
-rw-r--r--src/backend/BSXML.pm4
4 files changed, 0 insertions, 27 deletions
diff --git a/docs/api/api/obs.rng b/docs/api/api/obs.rng
index 218bb34..3dda4c1 100644
--- a/docs/api/api/obs.rng
+++ b/docs/api/api/obs.rng
@@ -221,12 +221,6 @@
</element>
</optional>
<zeroOrMore>
- <element name="buildenv">
- <attribute name="name"><data type="string"/></attribute>
- <text/>
- </element>
- </zeroOrMore>
- <zeroOrMore>
<element name="path">
<attribute name="repository">
<data type="string" />
diff --git a/src/api/app/models/db_project.rb b/src/api/app/models/db_project.rb
index 241fb3e..3febe56 100644
--- a/src/api/app/models/db_project.rb
+++ b/src/api/app/models/db_project.rb
@@ -743,19 +743,6 @@ class DbProject < ActiveRecord::Base
was_updated = true if current_repo.architectures.size > 0 or repo.each_arch.size > 0
- new_size = repo.each_buildenv.size
- old_size = current_repo.buildenvs.size
-
- if new_size > 0 or old_size > 0
- was_updated = true
- current_repo.buildenvs.each do |bev|
- bev.destroy
- end
- repo.each_buildenv do |bev|
- current_repo.buildenvs.create :name => bev.name, :value => bev.text
- end
- end
-
if was_updated
current_repo.save!
self.updated_at = Time.now
@@ -1116,9 +1103,6 @@ class DbProject < ActiveRecord::Base
end
r.path( :project => project_name, :repository => pe.link.name )
end
- repo.buildenvs.each do |bev|
- r.buildenv(:name => bev.name){ r.text(bev.value) }
- end
repo.architectures.each do |arch|
r.arch arch.name
end
diff --git a/src/api/app/models/repository.rb b/src/api/app/models/repository.rb
index af320b1..267b1c2 100644
--- a/src/api/app/models/repository.rb
+++ b/src/api/app/models/repository.rb
@@ -6,7 +6,6 @@ class Repository < ActiveRecord::Base
has_many :path_elements, :foreign_key => 'parent_id', :dependent => :delete_all, :order => "position"
has_many :links, :class_name => "PathElement", :foreign_key => 'repository_id'
has_many :download_stats
- has_many :buildenvs, :foreign_key => 'repository_id'
has_and_belongs_to_many :architectures, :order => "position", :list => true
diff --git a/src/backend/BSXML.pm b/src/backend/BSXML.pm
index af80483..6a3857e 100644
--- a/src/backend/BSXML.pm
+++ b/src/backend/BSXML.pm
@@ -43,9 +43,6 @@ use strict;
# [ $repo ], refers to the repository construct and allows again any number of them (0-X)
#]; closes the <package> child with </package>
-
-our $buildenv = [ buildenv => 'name', [], '_content' ];
-
our $repo = [
'repository' =>
'name',
@@ -61,7 +58,6 @@ our $repo = [
'project',
'repository',
]],
- [ $buildenv ],
[ 'arch' ],
'status',
];