Merge pull request #8601 from adrianschroeter/retracted

[api][backend] support retracted state for updates
openSUSE · Oct 24, 2019 · 2bbba82 · 2bbba82
2 parents 0a75626 + 2afce2a
commit 2bbba82
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/docs/api/api/patchinfo.rng b/docs/api/api/patchinfo.rng
@@ -79,6 +79,11 @@
             <text/>
           </element>
         </optional>
+        <optional>
+          <element name="retracted">
+            <empty/>
+          </element>
+        </optional>
         <optional>
           <element name="reboot_needed"> 
             <empty/>

diff --git a/src/api/app/models/patchinfo.rb b/src/api/app/models/patchinfo.rb
@@ -40,7 +40,7 @@ class TrackerNotFound < APIError
   attr_reader :document
   attr_writer :data
   attr_accessor :summary, :description, :packager, :category, :rating, :name,
-                :binaries, :version, :message, :relogin_needed,
+                :binaries, :version, :message, :retracted, :relogin_needed,
                 :reboot_needed, :zypp_restart_needed, :block, :block_reason, :issues,
                 :issueid, :issuetracker, :issueurl, :issuesum
 
@@ -294,6 +294,7 @@ def load_from_xml(patchinfo_xml)
     self.message = patchinfo_xml.value('message')
     self.relogin_needed = !patchinfo_xml.value('relogin_needed').nil?
     self.reboot_needed = !patchinfo_xml.value('reboot_needed').nil?
+    self.retracted = !patchinfo_xml.value('retracted').nil?
     self.zypp_restart_needed = !patchinfo_xml.value('zypp_restart_needed').nil?
     if patchinfo_xml.value('stopped')
       self.block = true
@@ -343,6 +344,7 @@ def to_xml(project, package)
       node.message message.gsub("\r\n", "\n") if message.present?
       node.reboot_needed if reboot_needed == '1'
       node.relogin_needed if relogin_needed == '1'
+      node.retracted if retracted == '1'
       node.zypp_restart_needed if zypp_restart_needed == '1'
       node.stopped block_reason if block == '1'
     end

diff --git a/src/backend/BSSched/BuildJob/Patchinfo.pm b/src/backend/BSSched/BuildJob/Patchinfo.pm
@@ -557,7 +557,7 @@ sub build {
   $broken ||= 'no binaries found' unless @upackages;
 
   my $update = {};
-  $update->{'status'} = 'stable';
+  $update->{'status'} = $patchinfo->{'retracted'} ? 'retracted' : 'stable';
   $update->{'from'} = $patchinfo->{'packager'} if $patchinfo->{'packager'};
   # quick hack, to be replaced with something sane
   if ($BSConfig::updateinfo_fromoverwrite) {

diff --git a/src/backend/BSXML.pm b/src/backend/BSXML.pm
@@ -257,6 +257,7 @@ our $patchinfo = [
             'message',  # optional pop-up message
             'swampid',	# obsolete
             'packager',
+            'retracted',
             'stopped',
             'zypp_restart_needed',
             'reboot_needed',