Hello community,

here is the log from the commit of package openSUSE-release-tools for 
openSUSE:Factory checked in at 2019-01-15 09:16:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
 and      /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openSUSE-release-tools"

Tue Jan 15 09:16:58 2019 rev:159 rq:664899 version:20190110.a9eeeb0

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
    2019-01-10 15:22:58.410353276 +0100
+++ 
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.28833/openSUSE-release-tools.changes
 2019-01-15 09:16:59.750200851 +0100
@@ -1,0 +2,6 @@
+Thu Jan 10 08:29:40 UTC 2019 - [email protected]
+
+- Update to version 20190110.a9eeeb0:
+  * Only decline delete requests that affect linked packages within the target
+
+-------------------------------------------------------------------

Old:
----
  openSUSE-release-tools-20190109.df13caa.obscpio

New:
----
  openSUSE-release-tools-20190110.a9eeeb0.obscpio

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.o2o5x1/_old  2019-01-15 09:17:00.694199972 +0100
+++ /var/tmp/diff_new_pack.o2o5x1/_new  2019-01-15 09:17:00.694199972 +0100
@@ -20,7 +20,7 @@
 %define source_dir openSUSE-release-tools
 %define announcer_filename factory-package-news
 Name:           openSUSE-release-tools
-Version:        20190109.df13caa
+Version:        20190110.a9eeeb0
 Release:        0
 Summary:        Tools to aid in staging and release work for openSUSE/SUSE
 License:        GPL-2.0-or-later AND MIT

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.o2o5x1/_old  2019-01-15 09:17:00.738199931 +0100
+++ /var/tmp/diff_new_pack.o2o5x1/_new  2019-01-15 09:17:00.738199931 +0100
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param 
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
-    <param 
name="changesrevision">f2759a531df6d2d148f491c0444850bb6be4b079</param>
+    <param 
name="changesrevision">a9eeeb0a98fde79c0667ac74fb8e0ff18239a01d</param>
   </service>
 </servicedata>

++++++ openSUSE-release-tools-20190109.df13caa.obscpio -> 
openSUSE-release-tools-20190110.a9eeeb0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/openSUSE-release-tools-20190109.df13caa/check_source.py 
new/openSUSE-release-tools-20190110.a9eeeb0/check_source.py
--- old/openSUSE-release-tools-20190109.df13caa/check_source.py 2019-01-09 
04:30:20.000000000 +0100
+++ new/openSUSE-release-tools-20190110.a9eeeb0/check_source.py 2019-01-10 
09:24:40.000000000 +0100
@@ -279,21 +279,25 @@
             self.review_messages['declined'] = "There is a pending request %s 
to %s/%s in process." % (','.join(ids), action.tgt_project, action.tgt_package)
             return False
 
-        # Decline the delete request against linked package.
-        links = root.findall('sourceinfo/linked')
-        if links is None or len(links) == 0:
-            if not self.ignore_devel:
-                self.devel_project_review_ensure(request, action.tgt_project, 
action.tgt_package)
+        # Decline delete requests against linked flavor package
+        linked = root.find('sourceinfo/linked')
+        if not (linked is None or self.check_linked_package(action, linked)):
+            return False
+
+        if not self.ignore_devel:
+            self.devel_project_review_ensure(request, action.tgt_project, 
action.tgt_package)
+
+        if not self.skip_add_reviews and self.repo_checker is not None:
+            self.add_review(self.request, by_user=self.repo_checker, msg='Is 
this delete request safe?')
 
-            if not self.skip_add_reviews and self.repo_checker is not None:
-                self.add_review(self.request, by_user=self.repo_checker, 
msg='Is this delete request safe?')
+        return True
+
+    def check_linked_package(self, action, linked):
+        if linked.get('project', action.tgt_project) != action.tgt_project:
             return True
-        else:
-            linked = links[0]
-            linked_project = linked.get('project')
-            linked_package = linked.get('package')
-            self.review_messages['declined'] = "This is an incorrect request, 
it's a linked package to %s/%s" % (linked_project, linked_package)
-            return False
+        linked_package = linked.get('package')
+        self.review_messages['declined'] = "Delete the package %s instead" % 
(linked_package)
+        return False
 
     def check_action_delete_project(self, request, action):
         # Presumably if the request is valid the bot should be disabled or

++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.o2o5x1/_old  2019-01-15 09:17:01.290199417 +0100
+++ /var/tmp/diff_new_pack.o2o5x1/_new  2019-01-15 09:17:01.294199413 +0100
@@ -1,5 +1,5 @@
 name: openSUSE-release-tools
-version: 20190109.df13caa
-mtime: 1547004620
-commit: df13caa3f3e0c38accc3e70ad1c9c8757e6a15af
+version: 20190110.a9eeeb0
+mtime: 1547108680
+commit: a9eeeb0a98fde79c0667ac74fb8e0ff18239a01d
 


Reply via email to