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 2022-03-04 00:17:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Fri Mar 4 00:17:29 2022 rev:387 rq:958592 version:20220303.39bbc90c
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2022-03-02 18:22:35.752659126 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1958/openSUSE-release-tools.changes
2022-03-04 00:18:00.584289889 +0100
@@ -1,0 +2,13 @@
+Thu Mar 03 07:16:50 UTC 2022 - [email protected]
+
+- Update to version 20220303.39bbc90c:
+ * package: pkglistgen requires zstd
+ * More origin manager cleanup
+
+-------------------------------------------------------------------
+Wed Mar 02 17:17:03 UTC 2022 - [email protected]
+
+- Update to version 20220303.8ad49177:
+ * skippkg-finder: use SLE update prior to GA for Respin
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20220302.3654dc91.obscpio
New:
----
openSUSE-release-tools-20220303.39bbc90c.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.FrhTJe/_old 2022-03-04 00:18:01.372290056 +0100
+++ /var/tmp/diff_new_pack.FrhTJe/_new 2022-03-04 00:18:01.376290057 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20220302.3654dc91
+Version: 20220303.39bbc90c
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
@@ -211,6 +211,7 @@
Requires: osclib = %{version}
Requires: python3-requests
Requires: python3-solv
+Requires: zstd
# we use the same user as repo-checker
PreReq: openSUSE-release-tools-repo-checker
BuildArch: noarch
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.FrhTJe/_old 2022-03-04 00:18:01.432290068 +0100
+++ /var/tmp/diff_new_pack.FrhTJe/_new 2022-03-04 00:18:01.436290069 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">3654dc9144bcb2422f92a1e50a1e921e470ecc7b</param>
+ <param
name="changesrevision">39bbc90c227d789bbd0a9c197e7d7a98d07e9cdd</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20220302.3654dc91.obscpio ->
openSUSE-release-tools-20220303.39bbc90c.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220302.3654dc91/dist/ci/flake-extra
new/openSUSE-release-tools-20220303.39bbc90c/dist/ci/flake-extra
--- old/openSUSE-release-tools-20220302.3654dc91/dist/ci/flake-extra
2022-03-02 14:39:00.000000000 +0100
+++ new/openSUSE-release-tools-20220303.39bbc90c/dist/ci/flake-extra
2022-03-03 08:12:19.000000000 +0100
@@ -2,4 +2,4 @@
# Should never contain references to products.
! grep -iP 'leap|factory|sle' \
- origin-manager.py osc-origin.py osclib/origin.py osclib/origin_listener.py
+ origin-manager.py osc-origin.py osclib/origin.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220302.3654dc91/dist/package/openSUSE-release-tools.spec
new/openSUSE-release-tools-20220303.39bbc90c/dist/package/openSUSE-release-tools.spec
---
old/openSUSE-release-tools-20220302.3654dc91/dist/package/openSUSE-release-tools.spec
2022-03-02 14:39:00.000000000 +0100
+++
new/openSUSE-release-tools-20220303.39bbc90c/dist/package/openSUSE-release-tools.spec
2022-03-03 08:12:19.000000000 +0100
@@ -211,6 +211,7 @@
Requires: osclib = %{version}
Requires: python3-requests
Requires: python3-solv
+Requires: zstd
# we use the same user as repo-checker
PreReq: openSUSE-release-tools-repo-checker
BuildArch: noarch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220302.3654dc91/docs/origin-manager.md
new/openSUSE-release-tools-20220303.39bbc90c/docs/origin-manager.md
--- old/openSUSE-release-tools-20220302.3654dc91/docs/origin-manager.md
2022-03-02 14:39:00.000000000 +0100
+++ new/openSUSE-release-tools-20220303.39bbc90c/docs/origin-manager.md
2022-03-03 08:12:19.000000000 +0100
@@ -441,44 +441,7 @@
@origin-manager change_devel projectFoo
```
-## Automatic updates
-
-For projects with at least one origin having `automatic_updates` enabled
source changes from enabled origins will be automatically submitted to the
target project. There is both a cron job that runs once daily and an event
listener that will make submissions immediately. The listener considers the
same control options as the cron job so if something like
`automatic_updates_delay` is configured the listener will not make updates for
that project and instead they will fallback to the cron job. The cron job also
handles configuration changes and backfilling newly managed projects.
-
### Automatic change_devel
If a source submission is accepted, but during update an origin cannot be
matched the annotation on the most recent request will be checked to see if it
was considered as devel project. If such an annotation exists a `change_devel`
request will automatically be created to match the annotation. After the
request is accept future updates will be submitted as appropriate.
-## Web interface
-
-A _web interface_ is provided using the _OBS operator_ server which wraps the
_origin CLI plugin_. The web interface is backed by a cache which is updated
trice-weekly and allows for quickly retrieving the full list of origins for all
packages within a project.
-
-In conjunction to the primary web interface a
[userscript](../userscript/README.md) is provided to automatically display
origin information on the OBS web interface. Both the package view and request
views are supplemented and provide links to the web interface. **Note that one
must have an active OBS session for either to work.**
-
-### Layout
-
-The interface condenses a rather large amount of information into one screen
and can be overwhelming at first glance. The following is a description of the
columns from left the right.
-
-#### Package list
-
-A list of all _source_ packages within a target project are shown with their
respective origin. The _revisions_ column denotes the type of the last 10
commits: green matches origin in target, red only in origin, and gray for
target revisions that do not match origin. The _request_ column shows the
highest open request for that package in the target project.
-
-#### Potentials and history
-
-The middle column shows the potential origins for the selected package along
with the version within that origin. The two icons are external diff (via OBS)
and submit to target from origin.
-
-The origin history shows source change requests for the selected package
against the target project. If an annotation is present the origin from the
annotation is extracted otherwise the source project is shown.
-
-#### Diff
-
-The last column shows a diff between the selected potential origin and the
target project. When a request from the history is also selected it shows the
diff between the potential origin and the request source.
-
-### Filtering and sorting
-
-One of the most useful features of the web interface is _filtering and
sorting_ which allows for a number different package states to be identified.
-
-The _origin_ column can be sorted to see packages grouped by origin or
filtered to show workarounds by entering `~`. Additionally, specific origins
can be filtered or even the `None` origin.
-
-The _revisions_ column can be sorted to show the most _behind_ (most red
revisions) packages first with the most _worked around_ (most gray revisions)
packages next. This is useful for seeing if updates are behind and determining
the reason (usually due to bot or human decline).
-
-The _request_ column can be sorted to place packages with requests at the top
of the list which is useful when doing lots of reviews against open requests
and thus flipping between requests and the origin manager web interface.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220302.3654dc91/gocd/checkers.opensuse.gocd.yaml
new/openSUSE-release-tools-20220303.39bbc90c/gocd/checkers.opensuse.gocd.yaml
---
old/openSUSE-release-tools-20220302.3654dc91/gocd/checkers.opensuse.gocd.yaml
2022-03-02 14:39:00.000000000 +0100
+++
new/openSUSE-release-tools-20220303.39bbc90c/gocd/checkers.opensuse.gocd.yaml
2022-03-03 08:12:19.000000000 +0100
@@ -139,30 +139,6 @@
- staging-bot
tasks:
- script: ./origin-manager.py -A https://api.opensuse.org --debug
review
- OS.Origin.Manager.Update:
- group: openSUSE.Checkers
- lock_behavior: unlockWhenFinished
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-origin-manager
- materials:
- script:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- timer:
- spec: 0 0 7 ? * *
- only_on_changes: false
- stages:
- - Run:
- approval: manual
- resources:
- - staging-bot
- tasks:
- - script: |-
- tempdir=$(mktemp -d)
- mkdir -p $tempdir/.osc-plugins
- ln -s $PWD/osc-origin.py $tempdir/.osc-plugins
- ln -s $PWD/osclib $tempdir/.osc-plugins
- HOME=$tempdir osc -A https://api.opensuse.org origin update
- rm -rf $tempdir
openSUSE.QA.Maint:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220302.3654dc91/gocd/checkers.suse.gocd.yaml
new/openSUSE-release-tools-20220303.39bbc90c/gocd/checkers.suse.gocd.yaml
--- old/openSUSE-release-tools-20220302.3654dc91/gocd/checkers.suse.gocd.yaml
2022-03-02 14:39:00.000000000 +0100
+++ new/openSUSE-release-tools-20220303.39bbc90c/gocd/checkers.suse.gocd.yaml
2022-03-03 08:12:19.000000000 +0100
@@ -78,30 +78,6 @@
- staging-bot
tasks:
- script: ./origin-manager.py -A https://api.suse.de --debug review
- SLE.Origin.Manager.Update:
- group: SLE.Checkers
- lock_behavior: unlockWhenFinished
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-origin-manager
- materials:
- script:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- timer:
- spec: 0 0 7 ? * *
- only_on_changes: false
- stages:
- - Run:
- approval: manual
- resources:
- - staging-bot
- tasks:
- - script: |-
- tempdir=$(mktemp -d)
- mkdir -p $tempdir/.osc-plugins
- ln -s $PWD/osc-origin.py $tempdir/.osc-plugins
- ln -s $PWD/osclib $tempdir/.osc-plugins
- HOME=$tempdir osc -A https://api.suse.de origin update
- rm -rf $tempdir
S15.SP4.Staging.Bot.Regular:
group: SLE.Checkers
lock_behavior: unlockWhenFinished
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220302.3654dc91/gocd/checkers.suse.gocd.yaml.erb
new/openSUSE-release-tools-20220303.39bbc90c/gocd/checkers.suse.gocd.yaml.erb
---
old/openSUSE-release-tools-20220302.3654dc91/gocd/checkers.suse.gocd.yaml.erb
2022-03-02 14:39:00.000000000 +0100
+++
new/openSUSE-release-tools-20220303.39bbc90c/gocd/checkers.suse.gocd.yaml.erb
2022-03-03 08:12:19.000000000 +0100
@@ -78,30 +78,6 @@
- staging-bot
tasks:
- script: ./origin-manager.py -A https://api.suse.de --debug review
- SLE.Origin.Manager.Update:
- group: SLE.Checkers
- lock_behavior: unlockWhenFinished
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-origin-manager
- materials:
- script:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- timer:
- spec: 0 0 7 ? * *
- only_on_changes: false
- stages:
- - Run:
- approval: manual
- resources:
- - staging-bot
- tasks:
- - script: |-
- tempdir=$(mktemp -d)
- mkdir -p $tempdir/.osc-plugins
- ln -s $PWD/osc-origin.py $tempdir/.osc-plugins
- ln -s $PWD/osclib $tempdir/.osc-plugins
- HOME=$tempdir osc -A https://api.suse.de origin update
- rm -rf $tempdir
S15.SP4.Staging.Bot.Regular:
group: SLE.Checkers
lock_behavior: unlockWhenFinished
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220302.3654dc91/gocd/monitors.gocd.yaml
new/openSUSE-release-tools-20220303.39bbc90c/gocd/monitors.gocd.yaml
--- old/openSUSE-release-tools-20220302.3654dc91/gocd/monitors.gocd.yaml
2022-03-02 14:39:00.000000000 +0100
+++ new/openSUSE-release-tools-20220303.39bbc90c/gocd/monitors.gocd.yaml
2022-03-03 08:12:19.000000000 +0100
@@ -188,57 +188,3 @@
git config --global user.name "GoCD Repo Monitor"
scripts/gocd/notify-obs_rsync.py --openqa
https://openqa.suse.de --repos repos --to notifications
- openSUSE.OriginManagerUpdate:
- group: Monitors
- lock_behavior: unlockWhenFinished
- timer:
- spec: 0 */5 * ? * *
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-origin-manager
- materials:
- script:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- stages:
- - Run:
- approval:
- type: manual
- jobs:
- Run:
- timeout: 10 # 5 minute still alive message
- resources:
- - monitor
- tasks:
- - script: |-
- tempdir=$(mktemp -d)
- mkdir -p $tempdir/.osc-plugins
- ln -s $PWD/osc-origin.py $tempdir/.osc-plugins
- ln -s $PWD/osclib $tempdir/.osc-plugins
- HOME=$tempdir osc -A https://api.opensuse.org origin update
--listen --listen-seconds 43200
- rm -rf $tempdir
- SUSE.OriginManagerUpdate:
- group: Monitors
- lock_behavior: unlockWhenFinished
- timer:
- spec: 0 */5 * ? * *
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-origin-manager
- materials:
- script:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- stages:
- - Run:
- approval:
- type: manual
- jobs:
- Run:
- timeout: 10 # 5 minute still alive message
- resources:
- - monitor
- tasks:
- - script: |-
- tempdir=$(mktemp -d)
- mkdir -p $tempdir/.osc-plugins
- ln -s $PWD/osc-origin.py $tempdir/.osc-plugins
- ln -s $PWD/osclib $tempdir/.osc-plugins
- HOME=$tempdir osc -A https://api.suse.de origin update
--listen --listen-seconds 43200
- rm -rf $tempdir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220302.3654dc91/osc-origin.py
new/openSUSE-release-tools-20220303.39bbc90c/osc-origin.py
--- old/openSUSE-release-tools-20220302.3654dc91/osc-origin.py 2022-03-02
14:39:00.000000000 +0100
+++ new/openSUSE-release-tools-20220303.39bbc90c/osc-origin.py 2022-03-03
08:12:19.000000000 +0100
@@ -1,4 +1,3 @@
-from __future__ import print_function
from datetime import timedelta
import json
import logging
@@ -81,11 +80,7 @@
raise oscerr.WrongArgs('A package must be indicated.')
level = logging.DEBUG if opts.debug else None
- if command == 'update':
- # Only way to include thread in pika log message.
- logging.basicConfig(level=level, format='<%(threadName)s>
[%(levelname).1s] %(message)s')
- else:
- logging.basicConfig(level=level, format='[%(levelname).1s]
%(message)s')
+ logging.basicConfig(level=level, format='[%(levelname).1s] %(message)s')
# Allow for determining project from osc store.
if not opts.project and core.is_project_dir('.'):
@@ -363,20 +358,6 @@
def osrt_origin_update(apiurl, opts, *packages):
- if opts.listen:
- from osclib.origin_listener import OriginSourceChangeListener
-
- logger = logging.getLogger()
- logger.setLevel(logging.INFO)
- listener = OriginSourceChangeListener(apiurl, logger, opts.project,
opts.dry)
- try:
- runtime = int(opts.listen_seconds) if opts.listen_seconds else None
- listener.run(runtime=runtime)
- except KeyboardInterrupt:
- listener.stop()
-
- return
-
if not opts.project:
for project in origin_updatable(apiurl):
opts.project = project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220302.3654dc91/osclib/origin_listener.py
new/openSUSE-release-tools-20220303.39bbc90c/osclib/origin_listener.py
--- old/openSUSE-release-tools-20220302.3654dc91/osclib/origin_listener.py
2022-03-02 14:39:00.000000000 +0100
+++ new/openSUSE-release-tools-20220303.39bbc90c/osclib/origin_listener.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,158 +0,0 @@
-import json
-from osclib.core import package_kind
-from osclib.core import project_remote_list
-from osclib.origin import origin_updatable_map
-from osclib.origin import origin_update
-from osclib.PubSubConsumer import PubSubConsumer
-import threading
-
-
-class OriginSourceChangeListener(PubSubConsumer):
- def __init__(self, apiurl, logger, project=None, dry=False):
- self.apiurl = apiurl
- self.project = project
- self.dry = dry
- self.listeners = {}
-
- amqp_prefix = 'suse' if self.apiurl.endswith('suse.de') else 'opensuse'
- super().__init__(amqp_prefix, logger)
-
- def run(self, runtime=None):
- super().run(runtime=runtime)
-
- for listener in self.listeners.values():
- listener.run(runtime=runtime)
-
- def stop(self):
- super().stop()
-
- for listener in self.listeners.values():
- listener.stop()
-
- def start_consuming(self):
- super().start_consuming()
-
- self.check_remotes()
-
- def routing_keys(self):
- return [self._prefix + k for k in [
- '.obs.package.commit',
- '.obs.package.delete',
- '.obs.request.create',
- ]]
-
- def on_message(self, unused_channel, method, properties, body):
- super().on_message(unused_channel, method, properties, body)
-
- payload = json.loads(body)
- if method.routing_key == '{}.obs.package.commit'.format(self._prefix):
- self.on_message_package_update(payload)
- elif method.routing_key ==
'{}.obs.package.delete'.format(self._prefix):
- self.on_message_package_update(payload)
- elif method.routing_key ==
'{}.obs.request.create'.format(self._prefix):
- self.on_message_request_create(payload)
- else:
- raise Exception('Unrequested message:
{}'.format(method.routing_key))
-
- def on_message_package_update(self, payload):
- origins = self.origin_updatable_map()
- self.update_consider(origins, payload['project'], payload['package'])
-
- def on_message_request_create(self, payload):
- origins = self.origin_updatable_map(pending=True)
- for action in payload['actions']:
- # The following code demonstrates the quality of the data
structure.
- # The base structure is inconsistent enough and yet the event data
- # structure manages to be different from XML structure (for no
- # reason) and even more inconsistent at that.
- if action['type'] == 'delete':
- if not action.get('targetpackage'):
- continue
-
- project = action['targetproject']
- package = action['targetpackage']
- elif action['type'] == 'maintenance_incident':
- if action['sourcepackage'] == 'patchinfo':
- continue
- project = action['target_releaseproject']
- if not action.get('targetpackage'):
- package = action['sourcepackage']
- else:
- repository_suffix_length = len(project) + 1 #
package.project
- package =
action['targetpackage'][:-repository_suffix_length]
- elif action['type'] == 'maintenance_release':
- if action['sourcepackage'] == 'patchinfo':
- continue
- project = action['targetproject']
- repository_suffix_length = len(project) + 1 # package.project
- package = action['sourcepackage'][:-repository_suffix_length]
- elif action['type'] == 'submit':
- project = action['targetproject']
- package = action['targetpackage']
- else:
- # Unsupported action type.
- continue
-
- self.update_consider(origins, project, package)
-
- def check_remotes(self):
- origins = self.origin_updatable_map()
- remotes = project_remote_list(self.apiurl)
- for remote, apiurl in remotes.items():
- for origin in origins:
- if origin.startswith(remote + ':') and apiurl not in
self.listeners:
- self.logger.info('starting remote listener due to {}
origin'.format(origin))
- self.listeners[apiurl] =
OriginSourceChangeListenerRemote(apiurl, self, remote)
- threading.Thread(target=self.listeners[apiurl].run,
name=apiurl).start()
-
- def origin_updatable_map(self, pending=None):
- # include_self=True to check for updates whenever the target package is
- # updated. This will catch needed follow-up change_devel and handle
- # updates blocked by frequency control.
- return origin_updatable_map(self.apiurl, pending=pending,
include_self=not pending)
-
- def update_consider(self, origins, origin_project, package):
- if origin_project not in origins:
- self.logger.info('skipped irrelevant origin:
{}'.format(origin_project))
- return
-
- for project in origins[origin_project]:
- if self.project and project != self.project:
- self.logger.info('skipping filtered target project:
{}'.format(project))
- continue
-
- # Check if package is of kind source in target or does not exists
in
- # target and is source in origin project -- this allows for deletes
- # and new submissions. Execute the check lazily due to expense.
- kind_target = package_kind(self.apiurl, project, package)
- kind_target_source = kind_target == 'source'
- kind_new_source = (kind_target is None and
- package_kind(self.apiurl, origin_project,
package) == 'source')
- if kind_target_source or kind_new_source:
- self.logger.info('checking for updates to
{}/{}...'.format(project, package))
- request_future = origin_update(self.apiurl, project, package)
- if request_future:
- request_future.print_and_create(self.dry)
- elif not kind_target_source:
- self.logger.info(f'skipped updating non-source package
{project}/{package}')
- else:
- self.logger.info(f'skipped submitting new non-source package
{project}/{package}')
-
-
-class OriginSourceChangeListenerRemote(OriginSourceChangeListener):
- def __init__(self, apiurl, parent, prefix):
- self.parent = parent
- self.prefix = prefix
-
- super().__init__(apiurl, self.parent.logger)
- self._run_until = self.parent._run_until
-
- def check_remotes(self):
- pass
-
- def origin_updatable_map(self, pending=None):
- return self.parent.origin_updatable_map(pending=pending)
-
- def update_consider(self, origins, origin_project, package):
- origin_project = '{}:{}'.format(self.prefix, origin_project)
- self.parent.update_consider(origins, origin_project, package)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220302.3654dc91/skippkg-finder.py
new/openSUSE-release-tools-20220303.39bbc90c/skippkg-finder.py
--- old/openSUSE-release-tools-20220302.3654dc91/skippkg-finder.py
2022-03-02 14:39:00.000000000 +0100
+++ new/openSUSE-release-tools-20220303.39bbc90c/skippkg-finder.py
2022-03-03 08:12:19.000000000 +0100
@@ -110,7 +110,7 @@
return True
return False
- def get_packagelist(self, project, by_project=True):
+ def get_packagelist(self, project, sle_pkglist=[], by_project=True):
"""
Return the list of package's info of a project.
If the latest package is from an incident then returns incident
@@ -127,7 +127,7 @@
orig_project = i.get('originproject')
is_incidentpkg = False
# Metapackage should not be selected
- if pkgname.startswith('000') or\
+ if pkgname.startswith('00') or\
pkgname.startswith('_') or\
pkgname.startswith('patchinfo.') or\
pkgname.startswith('skelcd-') or\
@@ -163,6 +163,9 @@
else:
pkglist[pkgname] = {'Project': orig_project, 'Package':
pkgname}
+ if sle_pkglist and pkgname in sle_pkglist and not
orig_project.startswith('openSUSE'):
+ pkglist[pkgname] = {'Project':
sle_pkglist[pkgname]['Project'], 'Package': sle_pkglist[pkgname]['Package']}
+
if by_project:
for pkg in pkglist.keys():
if pkglist[pkg]['Project'].startswith('SUSE:') and
self.is_sle_specific(pkg):
@@ -247,8 +250,11 @@
def crawl(self):
"""Main method"""
- leap_pkglist = self.get_packagelist(self.opensuse_project)
sle_pkglist = self.get_packagelist(self.sle_project, by_project=False)
+ if self.sle_project.endswith(':Update'):
+ leap_pkglist = self.get_packagelist(self.opensuse_project,
sle_pkglist)
+ else:
+ leap_pkglist = self.get_packagelist(self.opensuse_project)
# The selected_binarylist[] includes the latest sourcepackage list
# binary RPMs from the latest sources need to be presented in ftp
eventually
selected_binarylist = []
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.FrhTJe/_old 2022-03-04 00:18:02.164290222 +0100
+++ /var/tmp/diff_new_pack.FrhTJe/_new 2022-03-04 00:18:02.164290222 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20220302.3654dc91
-mtime: 1646228340
-commit: 3654dc9144bcb2422f92a1e50a1e921e470ecc7b
+version: 20220303.39bbc90c
+mtime: 1646291539
+commit: 39bbc90c227d789bbd0a9c197e7d7a98d07e9cdd
