Hello community,

here is the log from the commit of package osc for openSUSE:Factory checked in 
at 2019-10-30 14:45:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/osc (Old)
 and      /work/SRC/openSUSE:Factory/.osc.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "osc"

Wed Oct 30 14:45:57 2019 rev:139 rq:743821 version:0.166.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/osc/osc.changes  2019-10-28 17:00:22.237758170 
+0100
+++ /work/SRC/openSUSE:Factory/.osc.new.2990/osc.changes        2019-10-30 
14:46:34.534102990 +0100
@@ -1,0 +2,9 @@
+Tue Oct 29 10:18:24 UTC 2019 - Marco Strigl <[email protected]>
+
+- 0.166.1
+  * emergency fix for credentials handling:
+      - in case of an old passx entry in oscrc
+        osc did not work at all. Now we check in
+        the compat code if we have an passx entry. 
+
+-------------------------------------------------------------------

Old:
----
  osc-0.166.0.tar.gz

New:
----
  osc-0.166.1.tar.gz

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

Other differences:
------------------
++++++ osc.spec ++++++
--- /var/tmp/diff_new_pack.GqrUjo/_old  2019-10-30 14:46:35.390103900 +0100
+++ /var/tmp/diff_new_pack.GqrUjo/_new  2019-10-30 14:46:35.394103904 +0100
@@ -27,12 +27,12 @@
 %define use_python python
 %endif
 
-%define version_unconverted 0.166.0
+%define version_unconverted 0.166.1
 %define osc_plugin_dir %{_prefix}/lib/osc-plugins
 %define macros_file macros.osc
 
 Name:           osc
-Version:        0.166.0
+Version:        0.166.1
 Release:        0
 Summary:        Open Build Service Commander
 License:        GPL-2.0-or-later

++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.GqrUjo/_old  2019-10-30 14:46:35.422103934 +0100
+++ /var/tmp/diff_new_pack.GqrUjo/_new  2019-10-30 14:46:35.426103938 +0100
@@ -1,5 +1,5 @@
 pkgname=osc
-pkgver=0.166.0
+pkgver=0.166.1
 pkgrel=0
 pkgdesc="Open Build Service client"
 arch=('i686' 'x86_64')

++++++ _service ++++++
--- /var/tmp/diff_new_pack.GqrUjo/_old  2019-10-30 14:46:35.442103955 +0100
+++ /var/tmp/diff_new_pack.GqrUjo/_new  2019-10-30 14:46:35.442103955 +0100
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="version">0.166.0</param>
-    <param name="revision">0.166.0</param>
+    <param name="version">0.166.1</param>
+    <param name="revision">0.166.1</param>
     <param name="url">git://github.com/openSUSE/osc.git</param>
     <param name="scm">git</param>
   </service>

++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.GqrUjo/_old  2019-10-30 14:46:35.474103989 +0100
+++ /var/tmp/diff_new_pack.GqrUjo/_new  2019-10-30 14:46:35.474103989 +0100
@@ -1,4 +1,4 @@
-osc (0.166.0) unstable; urgency=low
+osc (0.166.1) unstable; urgency=low
   - Update to 0.161.1
 
  -- Marco Strigl <[email protected]>  Thu, 26 Oct 2017 14:42:00 +0200

++++++ osc-0.166.0.tar.gz -> osc-0.166.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/osc-0.166.0/NEWS new/osc-0.166.1/NEWS
--- old/osc-0.166.0/NEWS        2019-10-24 11:48:35.000000000 +0200
+++ new/osc-0.166.1/NEWS        2019-10-29 11:15:35.000000000 +0100
@@ -1,3 +1,9 @@
+0.166.1
+  - emergency fix for credentials handling:
+      * in case of an old passx entry in oscrc
+       osc did not work at all. Now we check in
+       the compat code if we have an passx entry.
+
 0.166.0
   - New password handling backend. Supported password stores:
       * Plaintext password
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/osc-0.166.0/osc/core.py new/osc-0.166.1/osc/core.py
--- old/osc-0.166.0/osc/core.py 2019-10-24 11:48:35.000000000 +0200
+++ new/osc-0.166.1/osc/core.py 2019-10-29 11:15:35.000000000 +0100
@@ -5,7 +5,7 @@
 
 from __future__ import print_function
 
-__version__ = '0.166.0'
+__version__ = '0.166.1'
 
 # __store_version__ is to be incremented when the format of the working copy
 # "store" changes in an incompatible way. Please add any needed migration
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/osc-0.166.0/osc/credentials.py 
new/osc-0.166.1/osc/credentials.py
--- old/osc-0.166.0/osc/credentials.py  2019-10-24 11:48:35.000000000 +0200
+++ new/osc-0.166.1/osc/credentials.py  2019-10-29 11:15:35.000000000 +0100
@@ -65,6 +65,8 @@
 
 class PlaintextConfigFileCredentialsManager(AbstractCredentialsManager):
     def get_password(self, url, user, defer=True):
+        if self._cp.has_option(url, 'passx', proper=True):
+            return self._cp.get(url, 'passx', raw=True)
         return self._cp.get(url, 'pass', raw=True)
 
     def set_password(self, url, user, password):
@@ -101,6 +103,10 @@
         password = base64.b64encode(compressed_pw).decode("ascii")
         super(self.__class__, self).set_password(url, user, password)
 
+    def delete_password(self, url, user):
+        self._cp.remove_option(url, 'passx')
+        super(self.__class__, self).delete_password(url, user)
+
     @classmethod
     def decode_password(cls, password):
         compressed_pw = base64.b64decode(password.encode("ascii"))

++++++ osc.dsc ++++++
--- /var/tmp/diff_new_pack.GqrUjo/_old  2019-10-30 14:46:35.838104376 +0100
+++ /var/tmp/diff_new_pack.GqrUjo/_new  2019-10-30 14:46:35.838104376 +0100
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: osc
-Version: 0.166.0
+Version: 0.166.1
 Binary: osc
 Maintainer: Adrian Schroeter <[email protected]>
 Architecture: any


Reply via email to