Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package openSUSE-release-tools for 
openSUSE:Factory checked in at 2021-11-22 23:04:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
 and      /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openSUSE-release-tools"

Mon Nov 22 23:04:31 2021 rev:352 rq:933104 version:20211122.45e3d064

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
    2021-11-20 22:48:24.271787810 +0100
+++ 
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1895/openSUSE-release-tools.changes
  2021-11-22 23:05:24.985683917 +0100
@@ -1,0 +2,6 @@
+Mon Nov 22 13:56:11 UTC 2021 - opensuse-releaset...@opensuse.org
+
+- Update to version 20211122.45e3d064:
+  * legal-auto: Move the "ignore channels" feature in the proper function
+
+-------------------------------------------------------------------

Old:
----
  openSUSE-release-tools-20211119.ce4a3e37.obscpio

New:
----
  openSUSE-release-tools-20211122.45e3d064.obscpio

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

Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.sBfAth/_old  2021-11-22 23:05:25.769681285 +0100
+++ /var/tmp/diff_new_pack.sBfAth/_new  2021-11-22 23:05:25.773681272 +0100
@@ -20,7 +20,7 @@
 %define source_dir openSUSE-release-tools
 %define announcer_filename factory-package-news
 Name:           openSUSE-release-tools
-Version:        20211119.ce4a3e37
+Version:        20211122.45e3d064
 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.sBfAth/_old  2021-11-22 23:05:25.821681111 +0100
+++ /var/tmp/diff_new_pack.sBfAth/_new  2021-11-22 23:05:25.821681111 +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">ce4a3e37ab85df869af09e3ce7926e98056e9e54</param>
+    <param 
name="changesrevision">0f9478cbf958e3643bfda4dc04c5288bb8738612</param>
   </service>
 </servicedata>

++++++ openSUSE-release-tools-20211119.ce4a3e37.obscpio -> 
openSUSE-release-tools-20211122.45e3d064.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/openSUSE-release-tools-20211119.ce4a3e37/legal-auto.py 
new/openSUSE-release-tools-20211122.45e3d064/legal-auto.py
--- old/openSUSE-release-tools-20211119.ce4a3e37/legal-auto.py  2021-11-19 
13:08:27.000000000 +0100
+++ new/openSUSE-release-tools-20211122.45e3d064/legal-auto.py  2021-11-22 
14:55:40.000000000 +0100
@@ -96,9 +96,18 @@
             return False
         return True
 
+    def default_good(self, _, package):
+        if package == 'patchinfo' or package.startswith('patchinfo.'):
+            return True
+        if package.endswith('.SUSE_Channels'):
+            return True
+        return False
+
     def check_source_submission(self, src_project, src_package, src_rev, 
target_project, target_package):
         self.logger.info("%s/%s@%s -> %s/%s" % (src_project,
                                                 src_package, src_rev, 
target_project, target_package))
+        if self.default_good(src_project, src_package):
+            return True
         to_review = self.open_reviews.get(self.request_nick(), None)
         if to_review:
             self.logger.info("Found {}".format(json.dumps(to_review)))
@@ -214,31 +223,24 @@
             self.pkg_cache = {}
 
         self.packages = []
-        self._query_sources(project)
+        self._query_sources_for_product_import(project)
         with open(yaml_path, 'w') as file:
             yaml.dump(self.pkg_cache, file)
         url = osc.core.makeurl(self.legaldb, ['products', project])
         request = REQ.patch(url, headers=self.legaldb_headers, data={'id': 
self.packages}).json()
 
-    def _query_sources(self, project):
+    def _query_sources_for_product_import(self, project):
         url = osc.core.makeurl(
             self.apiurl, ['source', project], {'view': 'info'})
         f = self.retried_GET(url)
         root = ET.parse(f).getroot()
         for si in root.findall('sourceinfo'):
+            print(ET.tostring(si))
             if si.findall('error'):
                 continue
             package = si.get('package')
             if ':' in package:
                 continue
-            if package == 'patchinfo' or package.startswith('patchinfo.'):
-                continue
-            if package.endswith('.SUSE_Channels'):
-                continue
-            # skip packages that have _channel inside
-            if si.find('filename').text == '_channel':
-                self.logger.info("SKIP {}".format(si.find('filename').text))
-                continue
             # handle maintenance links - we only want the latest
             match = re.match(r'(\S+)\.\d+$', package)
             if match:
@@ -249,10 +251,6 @@
                 continue
             skip = False
             for l in si.findall('linked'):
-                if l.get('project') == 'SUSE:Channels':
-                    self.logger.info("SKIP {}, it links to {}".format(package, 
l.get('project')))
-                    skip = True
-                    break
                 lpackage = l.get('package')
                 # strip sle11's .imported_ suffix
                 lpackage = re.sub(r'\.imported_\d+$', '', lpackage)

++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.sBfAth/_old  2021-11-22 23:05:26.445679017 +0100
+++ /var/tmp/diff_new_pack.sBfAth/_new  2021-11-22 23:05:26.449679004 +0100
@@ -1,5 +1,5 @@
 name: openSUSE-release-tools
-version: 20211119.ce4a3e37
-mtime: 1637323707
-commit: ce4a3e37ab85df869af09e3ce7926e98056e9e54
+version: 20211122.45e3d064
+mtime: 1637589340
+commit: 45e3d064afff60d9bdf9e590c9c2f5b8c8d2f7f7
 

Reply via email to