Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2018-08-06 11:53:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Mon Aug 6 11:53:51 2018 rev:117 rq:627473 version:20180803.b58b4e4
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2018-08-03 12:37:15.055565037 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes
2018-08-06 11:53:53.949204921 +0200
@@ -1,0 +2,19 @@
+Fri Aug 03 09:15:14 UTC 2018 - [email protected]
+
+- Update to version 20180803.b58b4e4:
+ * pkglistgen: fix calling expand_repos() in CommandLineInterface
+ * pkglistgen: respect main_repo setup for other variant
+
+-------------------------------------------------------------------
+Thu Aug 02 11:23:10 UTC 2018 - [email protected]
+
+- Update to version 20180802.dec881d:
+ * leaper: fix error with no lookup_150 attribute exist after introduced
PackageLookup
+
+-------------------------------------------------------------------
+Wed Aug 01 15:28:59 UTC 2018 - [email protected]
+
+- Update to version 20180801.cc79ce0:
+ * Lazy evaluation the ring projects
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20180801.174755e.obscpio
New:
----
openSUSE-release-tools-20180803.b58b4e4.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.fbxdMD/_old 2018-08-06 11:53:55.113206942 +0200
+++ /var/tmp/diff_new_pack.fbxdMD/_new 2018-08-06 11:53:55.117206949 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20180801.174755e
+Version: 20180803.b58b4e4
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.fbxdMD/_old 2018-08-06 11:53:55.161207025 +0200
+++ /var/tmp/diff_new_pack.fbxdMD/_new 2018-08-06 11:53:55.161207025 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">174755ed28b54395551c2e1c6560af12ae17a4fe</param>
+ <param
name="changesrevision">b58b4e43dcbbe735a41c7b451af59bbc4b97d204</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20180801.174755e.obscpio ->
openSUSE-release-tools-20180803.b58b4e4.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20180801.174755e/leaper.py
new/openSUSE-release-tools-20180803.b58b4e4/leaper.py
--- old/openSUSE-release-tools-20180801.174755e/leaper.py 2018-08-01
15:47:29.000000000 +0200
+++ new/openSUSE-release-tools-20180803.b58b4e4/leaper.py 2018-08-03
11:02:05.000000000 +0200
@@ -291,8 +291,8 @@
self.logger.debug("found request")
return good
# let's see where it came from before
- if package in self.lookup_150:
- oldorigin = self.lookup_150[package]
+ oldorigin = self.lookup.get('openSUSE:Leap:15.0',
target_package)
+ if oldorigin:
self.logger.debug("oldorigin {}".format(oldorigin))
# Factory. So it's ok to keep upgrading it to Factory
# TODO: whitelist packages where this is ok and block
others?
@@ -307,8 +307,7 @@
return good
# TODO Ugly save for 15.2 (n-2).
elif False and oldorigin.startswith('openSUSE:Leap:15.0'):
- o = self.lookup_150[package]
- self.logger.info("Package was from %s in 15.0", o)
+ self.logger.info("Package was from %s in 15.0",
oldorigin)
# the release manager needs to review attempts to upgrade to
Factory
is_fine_if_factory = True
self.needs_release_manager = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180801.174755e/osclib/stagingapi.py
new/openSUSE-release-tools-20180803.b58b4e4/osclib/stagingapi.py
--- old/openSUSE-release-tools-20180801.174755e/osclib/stagingapi.py
2018-08-01 15:47:29.000000000 +0200
+++ new/openSUSE-release-tools-20180803.b58b4e4/osclib/stagingapi.py
2018-08-03 11:02:05.000000000 +0200
@@ -74,6 +74,7 @@
# Store some prefix / data used in the code.
self.user = conf.get_apiurl_usr(apiurl)
+ self._rings = None
self._ring_packages = None
self._ring_packages_for_links = None
self._packages_staged = None
@@ -81,15 +82,6 @@
self._supersede = False
self._package_disabled = {}
- # If the project support rings, inititialize some variables.
- if self.crings:
- self.rings = (
- '{}:0-Bootstrap'.format(self.crings),
- '{}:1-MinimalX'.format(self.crings)
- )
- else:
- self.rings = []
-
Cache.init()
def __getattr__(self, attr):
@@ -111,6 +103,21 @@
return self.__getattribute__(attr)
@property
+ def rings(self):
+ if self._rings is None:
+
+ # If the project support rings, inititialize some variables.
+ if self.crings:
+ self._rings = (
+ '{}:0-Bootstrap'.format(self.crings),
+ '{}:1-MinimalX'.format(self.crings)
+ )
+ else:
+ self._rings = []
+
+ return self._rings
+
+ @property
def ring_packages(self):
if self._ring_packages is None:
self._ring_packages = self._generate_ring_packages()
@@ -1838,4 +1845,3 @@
def expanded_repos(self, repo):
return self.expand_project_repo(self.project, repo, [])
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180801.174755e/pkglistgen.py
new/openSUSE-release-tools-20180803.b58b4e4/pkglistgen.py
--- old/openSUSE-release-tools-20180801.174755e/pkglistgen.py 2018-08-01
15:47:29.000000000 +0200
+++ new/openSUSE-release-tools-20180803.b58b4e4/pkglistgen.py 2018-08-03
11:02:05.000000000 +0200
@@ -524,8 +524,8 @@
for e in excludes:
g.ignore(self.groups[e])
- def expand_repos(self, project, repo):
- return StagingAPI(self.apiurl, project).expanded_repos('standard')
+ def expand_repos(self, project, repo='standard'):
+ return StagingAPI(self.apiurl, project).expanded_repos(repo)
def _check_supplements(self):
tocheck = set()
@@ -686,7 +686,7 @@
class CommandLineInterface(ToolBase.CommandLineInterface):
- SCOPES = ['all', 'arm', 'target', 'rings', 'ports', 'staging']
+ SCOPES = ['all', 'target', 'rings', 'staging', 'arm']
def __init__(self, *args, **kwargs):
ToolBase.CommandLineInterface.__init__(self, args, kwargs)
@@ -813,7 +813,7 @@
def do_create_sle_weakremovers(self, subcmd, opts, *prjs):
for prj in prjs:
logger.debug("processing %s", prj)
- self.expand_repos(prj, 'standard')
+ self.tool.expand_repos(prj, 'standard')
opts.project = prj
self.do_update('update', opts)
@@ -1184,7 +1184,7 @@
main_repo = 'ports'
opts.project += ':ARM'
self.repos = self.tool.expand_repos(opts.project, main_repo)
- self.update_and_solve_target_wrapper(apiurl, target_project,
target_config, main_repo, opts, drop_list=True)
+ self.update_and_solve_target_wrapper(api, target_project,
target_config, main_repo, opts, drop_list=True)
return self.error_occured
elif opts.scope == 'ports':
# TODO Continue supporting #1297, but should be abstracted.
@@ -1295,7 +1295,7 @@
repos_ = self.repos
opts_nonfree = copy.deepcopy(opts)
opts_nonfree.project = nonfree
- self.repos = self.expand_repos(nonfree, main_repo)
+ self.repos = self.tool.expand_repos(nonfree, main_repo)
self.do_update('update', opts_nonfree)
# Switch repo back to main target project.
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.fbxdMD/_old 2018-08-06 11:53:55.881208275 +0200
+++ /var/tmp/diff_new_pack.fbxdMD/_new 2018-08-06 11:53:55.881208275 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20180801.174755e
-mtime: 1533131249
-commit: 174755ed28b54395551c2e1c6560af12ae17a4fe
+version: 20180803.b58b4e4
+mtime: 1533286925
+commit: b58b4e43dcbbe735a41c7b451af59bbc4b97d204
