commit osc for openSUSE:12.3

1 Mar 2013

Hello community,

here is the log from the commit of package osc for openSUSE:12.3 checked in at 2013-03-01 07:38:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/osc (Old)
 and      /work/SRC/openSUSE:12.3/.osc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "osc", Maintainer is "adrian@suse.com"

Changes:
--------

--- /work/SRC/openSUSE:12.3/osc/osc.changes	2013-02-25 20:39:54.000000000 +0100
+++ /work/SRC/openSUSE:12.3/.osc.new/osc.changes	2013-03-01 07:39:04.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Feb 26 16:23:26 UTC 2013 - adrian@suse.de
+
+- 0.139.1:
+  - do not crash on invalid authentification setup
+
+-------------------------------------------------------------------

Old:
----
  osc-0.139.0.tar.gz

New:
----
  PKGBUILD
  osc-0.139.1.tar.gz

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

Other differences:
------------------
++++++ osc.spec ++++++
--- /var/tmp/diff_new_pack.UBpds7/_old	2013-03-01 07:39:04.000000000 +0100
+++ /var/tmp/diff_new_pack.UBpds7/_new	2013-03-01 07:39:04.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           osc
-Version:        0.139.0
+Version:        0.139.1
 Release:        0
 Summary:        openSUSE Build Service Commander
 License:        GPL-2.0+

++++++ PKGBUILD ++++++
pkgname=osc
pkgver=0.139.1
pkgrel=1
pkgdesc="Open Build Service client"
arch=('i686' 'x86_64')
url="https://www.github.com/openSUSE/osc"
license=('GPL-2.0+' 'GPL-2.0')
groups=('base-devel')
depends=('python2')
source=(osc-${pkgver}.tar.gz)
md5sums=('c2f5ef8b09f31cf917265201c599e1e9')

package() {
  msg "Installing osc ..."
  cd "${srcdir}"/osc-${pkgver}
  python setup.py build
  python setup.py install --prefix=/usr --root=${pkgdir}
  ln -s osc-wrapper.py ${pkgdir}/usr/bin/osc
}
++++++ _service ++++++
--- /var/tmp/diff_new_pack.UBpds7/_old	2013-03-01 07:39:04.000000000 +0100
+++ /var/tmp/diff_new_pack.UBpds7/_new	2013-03-01 07:39:04.000000000 +0100
@@ -1,6 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="version">0.139.0</param>
+    <param name="version">0.139.1</param>
+    <param name="revision">0.139</param>
     <param name="url">git://github.com/openSUSE/osc.git</param>
     <param name="scm">git</param>
   </service>

++++++ osc-0.139.0.tar.gz -> osc-0.139.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.139.0/osc/conf.py new/osc-0.139.1/osc/conf.py
--- old/osc-0.139.0/osc/conf.py	2013-02-25 15:41:16.000000000 +0100
+++ new/osc-0.139.1/osc/conf.py	2013-02-26 14:09:48.000000000 +0100
@@ -798,6 +798,7 @@
         scheme, host = parse_apisrv_url(config.get('scheme', 'https'), url)
         apiurl = urljoin(scheme, host)
         user = None
+        password = None
         if config['use_keyring'] and GENERIC_KEYRING:
             try:
                 # Read from keyring lib if available
@@ -827,6 +828,13 @@
             print >>sys.stderr, 'Warning: blank user in the keyring for the ' \
                 'apiurl %s.\nPlease fix your keyring entry.'
 
+        if user is not None and password is None:
+            err = ('no password defined for "%s".\nPlease fix your keyring '
+                   'entry or gnome-keyring setup.\nAssuming an empty password.'
+                   % url)
+            print >>sys.stderr, err
+            password = ''
+
         # Read credentials from config
         if user is None:
             #FIXME: this could actually be the ideal spot to take defaults
@@ -858,9 +866,6 @@
             if not config['plaintext_passwd']:
                 password = passwordx
 
-        if password is None or len(password) == 0:
-                print >>sys.stderr, 'no password defined for ', url, '.\nPlease fix your keyring entry or python-keyring setup.'
-
         if cp.has_option(url, 'http_headers'):
             http_headers = cp.get(url, 'http_headers')
             http_headers = http_header_regexp.findall(http_headers)

++++++ osc.dsc ++++++
--- /var/tmp/diff_new_pack.UBpds7/_old	2013-03-01 07:39:04.000000000 +0100
+++ /var/tmp/diff_new_pack.UBpds7/_new	2013-03-01 07:39:04.000000000 +0100
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: osc
-Version: 0.139.0
+Version: 0.139.1
 Binary: osc
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: any

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)