rpm/osc
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osc?expand=0&rev=21

Browse Source
This commit is contained in:
OBS User unknown 2008-04-23 00:04:55 +00:00 committed by Git OBS Bridge
parent 7eb7fb23b9
commit 5a3f6985a9
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bug-378421_osc_cookiejar_fix.diff Normal file
View File

@ -0,0 +1,21 @@
Index: osc/core.py
===================================================================
--- osc/core.py (Revision 3704)
+++ osc/core.py (Arbeitskopie)
@@ -1385,11 +1385,12 @@
raise
- fd = urllib2.urlopen(req, data=data)
+ try:
+ fd = urllib2.urlopen(req, data=data)
+ finally:
+ if hasattr(conf.cookiejar, 'save'):
+ conf.cookiejar.save(ignore_discard=True)
- if hasattr(conf.cookiejar, 'save'):
- conf.cookiejar.save(ignore_discard=True)
-
if filefd: filefd.close()
# this code is for debugging empty responses from api.opensuse.org

5
osc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Apr 12 07:36:40 CEST 2008 - adrian@suse.de
- add patch from abauer to fix cookie handling bnc#378421
-------------------------------------------------------------------
Wed Apr 2 16:36:40 CEST 2008 - poeml@suse.de

6
osc.spec
View File

@ -14,13 +14,14 @@
Name: osc
BuildRequires: python-devel
Version: 0.99
Release: 36
Release: 40
Group: Development/Tools/Other
License: GPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/clientlib/python/osc/
# v=0.99; svn export https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/clientlib/python/osc osc-$v; tar czf osc-$v.tar.gz osc-$v
Source: osc-%{version}.tar.gz
Patch: bug-378421_osc_cookiejar_fix.diff
Summary: openSUSE (build service) commander
Requires: python-urlgrabber
#
@ -59,6 +60,7 @@ Authors:
%prep
%setup -q -n osc-%{version}
%patch
%build
CFLAGS="%{optflags}" \
@ -80,6 +82,8 @@ mkdir -p %{buildroot}/var/lib/osc-plugins
%doc README TODO NEWS
%changelog
* Sat Apr 12 2008 adrian@suse.de
- add patch from abauer to fix cookie handling bnc#378421
* Wed Apr 02 2008 poeml@suse.de
- update to r3614:
- osc commit: implement committing with keeping links (to commit