Hello community, here is the log from the commit of package osc-plugin-collab for openSUSE:Factory checked in at 2019-03-22 15:09:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc-plugin-collab (Old) and /work/SRC/openSUSE:Factory/.osc-plugin-collab.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc-plugin-collab" Fri Mar 22 15:09:16 2019 rev:11 rq:687309 version:0.100 Changes: -------- --- /work/SRC/openSUSE:Factory/osc-plugin-collab/osc-plugin-collab.changes 2017-11-20 17:06:28.159453126 +0100 +++ /work/SRC/openSUSE:Factory/.osc-plugin-collab.new.25356/osc-plugin-collab.changes 2019-03-22 15:09:22.349390442 +0100 @@ -1,0 +2,6 @@ +Thu Mar 21 12:20:27 UTC 2019 - [email protected] + +- Update to version 0.100: + + Support new location for oscrc in ~/.config/osc/ + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc-plugin-collab.spec ++++++ --- /var/tmp/diff_new_pack.OKBXWz/_old 2019-03-22 15:09:22.885389978 +0100 +++ /var/tmp/diff_new_pack.OKBXWz/_new 2019-03-22 15:09:22.889389974 +0100 @@ -1,7 +1,7 @@ # # spec file for package osc-plugin-collab # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2009 Vincent Untz <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -13,12 +13,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: osc-plugin-collab -Version: 0.99 +Version: 0.100 Release: 0 Summary: Plugin to make collaboration easier with osc License: BSD-3-Clause ++++++ osc-collab.py ++++++ --- /var/tmp/diff_new_pack.OKBXWz/_old 2019-03-22 15:09:22.909389957 +0100 +++ /var/tmp/diff_new_pack.OKBXWz/_new 2019-03-22 15:09:22.909389957 +0100 @@ -59,7 +59,7 @@ from osc import conf -OSC_COLLAB_VERSION = '0.99' +OSC_COLLAB_VERSION = '0.100' # This is a hack to have osc ignore the file we create in a package directory. _osc_collab_helper_prefixes = [ 'osc-collab.', 'osc-gnome.' ] @@ -3965,7 +3965,10 @@ # See get_config() in osc/conf.py and postoptparse() in # osc/commandline.py - conffile = self.options.conffile or os.environ.get('OSC_CONFIG', '~/.oscrc') + if self.options.conffile: + conffile = self.options.conffile + else: + conffile = conf.identify_conf() _osc_collab_osc_conffile = os.path.expanduser(conffile) _collab_migrate_gnome_config(apiurl)
