From c4db706e31fda5b572eaabff68f98436a4adb92f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 26 Jun 2008 00:40:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osc?expand=0&rev=22 --- bug-378421_osc_cookiejar_fix.diff | 21 ------ debian.changelog | 103 ++++++++++++++++++++++++++++++ osc-0.104.tar.gz | 3 + osc-0.99.tar.gz | 3 - osc.changes | 96 +++++++++++++++++++++++++++- osc.dsc | 2 +- osc.spec | 85 +++++++++++++++++++++--- 7 files changed, 276 insertions(+), 37 deletions(-) delete mode 100644 bug-378421_osc_cookiejar_fix.diff create mode 100644 osc-0.104.tar.gz delete mode 100644 osc-0.99.tar.gz diff --git a/bug-378421_osc_cookiejar_fix.diff b/bug-378421_osc_cookiejar_fix.diff deleted file mode 100644 index a04b4f3..0000000 --- a/bug-378421_osc_cookiejar_fix.diff +++ /dev/null @@ -1,21 +0,0 @@ -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 diff --git a/debian.changelog b/debian.changelog index acbc687..ab5d072 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,106 @@ +osc (0.104-1) unstable; urgency=high + + - update to r4164 (version 0.104): + - osc update: after update, reset the revision when updating + multiple package. Fixes "404: Not Found" type errors when + updating an entire project. [bnc#399177] + - more/better error messages in some error scenarios + - osc wipebinaries: add missing check for commandline arguments, + which could cause a PACKAGE argument to be ignored + - fixed make_diff in order to avoid errors when committing a new + package (created with mkpac) + + -- Peter Poeml Tue, 11 Jun 2008 12:00:00 +0200 + +osc (0.103-1) unstable; urgency=high + + - update to r4120 (version 0.103): + - osc submitreq create: simplify by make osc guess needed + parameters, if there is a working copy and it is a source link. + - osc submitreq create: don't stop on packages that have a devel + project defined, if the submit actually comes from that + project. + - osc checkout: checkout of source links is now done in expanded + form per default. The new option --unexpand-link can be used to + get the raw link file. + - show the API's error message for HTTP 403 (Forbidden) replies. + + -- Peter Poeml Tue, 6 Jun 2008 12:00:00 +0200 + +osc (0.102-1) unstable; urgency=high + + - update to r4089 (version 0.102) + - osc branch: Show the actually created branch project name, not + a guessed one. Add --nodevelproject. + - osc submitreq: look up the develproject of the target, and if + there is one, don't create the request, unless forced with + --nodevelproject. + - when -d (global, for debug) was used, save the body because it can't be read twice + + -- Peter Poeml Tue, 3 Jun 2008 12:00:00 +0200 + +osc (0.101-1) unstable; urgency=high + + - update to r4030: + - version 0.101 + - add osc branch command, using the branch API call to branch a package to + home:poeml:branches:PRJ/PKG + - osc commit now opens $EDITOR for commit message + - improved error handling, when API returns HTTP status code 400 (bad request) + - osc status: implement -q/--quiet switch + - osc info: slightly more verbose + - osc deletepac: allow deletion of multiple packages at once + - make "osc meta prjconf -e" work again (probably caused by r3702) + + -- Peter Poeml Tue, 27 May 2008 12:00:00 +0200 + +osc (0.100-2) unstable; urgency=high + + - update to r4002: + - osc maintainer: new -D/--devel-project switch + - osc rprjresults/rresults: small fixes + - facilitate correct syntax highlighting when editing metadata + + -- Peter Poeml Mon, 20 May 2008 12:00:00 +0200 + +osc (0.100-1) unstable; urgency=high + + - update to r3995: + - version 0.100 + - improved error handling (babysitter.py wrapper, oscerr.py exception classes) + Tracebacks are mostly suppressed now. To enable them, use + | -t, --traceback print call trace in case of errors + or set traceback=1 in .oscrc. + - other new global options for debugging: + | --debugger jump into the debugger before executing anything + | --post-mortem jump into the debugger in case of errors + | -d, --debug print info useful for debugging + - make way for more seamless osc version updates (the .osc directory in working copies + will have its own versioning in the future) + - osc rprjresults and osc rresults: new commands to show remote build results + - osc build: added --baselibs and --jobs options + - osc copypac: added --keep-maintainers switch + - BUILD_DIST environment variable will be ignored (bnc#359846) + The following environment variables can still be used: + * OSC_SU_WRAPPER overrides the setting of su-wrapper. + * OSC_BUILD_ROOT overrides the setting of build-root. + * OSC_PACKAGECACHEDIR overrides the setting of packagecachedir. + - a few bug fixes. + + -- Peter Poeml Mon, 19 May 2008 12:00:00 +0200 + +osc (0.99-11) unstable; urgency=high + + - remove the patch added by Adrian (bnc#378421) + + -- Peter Poeml Wed, 21 Apr 2008 12:00:00 +0200 + +osc (0.99-10) unstable; urgency=high + + - add patch from abauer to fix cookie handling (bnc#378421) + + -- Adrian Schroeter Sat, 12 Apr 2008 12:00:00 +0200 + osc (0.99-9) unstable; urgency=high - update to r3614: diff --git a/osc-0.104.tar.gz b/osc-0.104.tar.gz new file mode 100644 index 0000000..1b2f355 --- /dev/null +++ b/osc-0.104.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:721e5b204e591b8729b95e0836d2674638d80475b8e35ca85dabe96d63af4159 +size 89422 diff --git a/osc-0.99.tar.gz b/osc-0.99.tar.gz deleted file mode 100644 index 7f0e4c6..0000000 --- a/osc-0.99.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f0811182d72505d23e515b472b7afaf6c4cf528a75114a72ada3f656174128a -size 83736 diff --git a/osc.changes b/osc.changes index de8ae3a..b9d9802 100644 --- a/osc.changes +++ b/osc.changes @@ -1,7 +1,97 @@ +------------------------------------------------------------------- +Wed Jun 11 10:34:53 CEST 2008 - poeml@suse.de + +- update to r4164 (version 0.104): + - osc update: after update, reset the revision when updating + multiple package. Fixes "404: Not Found" type errors when + updating an entire project. [bnc#399177] + - more/better error messages in some error scenarios + - osc wipebinaries: add missing check for commandline arguments, + which could cause a PACKAGE argument to be ignored + - fixed make_diff in order to avoid errors when committing a new + package (created with mkpac) + +------------------------------------------------------------------- +Fri Jun 6 14:05:21 CEST 2008 - poeml@suse.de + +- update to r4120 (version 0.103): + - osc submitreq create: simplify by make osc guess needed + parameters, if there is a working copy and it is a source link. + - osc submitreq create: don't stop on packages that have a devel + project defined, if the submit actually comes from that + project. + - osc checkout: checkout of source links is now done in expanded + form per default. The new option --unexpand-link can be used to + get the raw link file. + - show the API's error message for HTTP 403 (Forbidden) replies. + +------------------------------------------------------------------- +Tue Jun 3 17:15:26 CEST 2008 - poeml@suse.de + +- update to r4089 (version 0.102) + - osc branch: Show the actually created branch project name, not + a guessed one. Add --nodevelproject. + - osc submitreq: look up the develproject of the target, and if + there is one, don't create the request, unless forced with + --nodevelproject. + - when -d (global, for debug) was used, save the body because it can't be read twice + +------------------------------------------------------------------- +Tue May 27 12:54:26 CEST 2008 - poeml@suse.de + +- update to r4030: + - version 0.101 + - add osc branch command, using the branch API call to branch a package to + home:poeml:branches:PRJ/PKG + - osc commit now opens $EDITOR for commit message + - improved error handling, when API returns HTTP status code 400 (bad request) + - osc status: implement -q/--quiet switch + - osc info: slightly more verbose + - osc deletepac: allow deletion of multiple packages at once + - make "osc meta prjconf -e" work again (probably caused by r3702) + +------------------------------------------------------------------- +Tue May 20 14:33:52 CEST 2008 - poeml@suse.de + +- update to r4002: + - osc maintainer: new -D/--devel-project switch + - osc rprjresults/rresults: small fixes + - facilitate correct syntax highlighting when editing metadata + +------------------------------------------------------------------- +Mon May 19 17:14:45 CEST 2008 - poeml@suse.de + +- update to r3995: + - version 0.100 + - improved error handling (babysitter.py wrapper, oscerr.py exception classes) + Tracebacks are mostly suppressed now. To enable them, use + | -t, --traceback print call trace in case of errors + or set traceback=1 in .oscrc. + - other new global options for debugging: + | --debugger jump into the debugger before executing anything + | --post-mortem jump into the debugger in case of errors + | -d, --debug print info useful for debugging + - make way for more seamless osc version updates (the .osc directory in working copies + will have its own versioning in the future) + - osc rprjresults and osc rresults: new commands to show remote build results + - osc build: added --baselibs and --jobs options + - osc copypac: added --keep-maintainers switch + - BUILD_DIST environment variable will be ignored (bnc#359846) + The following environment variables can still be used: + * OSC_SU_WRAPPER overrides the setting of su-wrapper. + * OSC_BUILD_ROOT overrides the setting of build-root. + * OSC_PACKAGECACHEDIR overrides the setting of packagecachedir. + - a few bug fixes. + +------------------------------------------------------------------- +Mon Apr 21 18:45:29 CEST 2008 - poeml@suse.de + +- remove the patch added by Adrian (bnc#378421) + ------------------------------------------------------------------- Sat Apr 12 07:36:40 CEST 2008 - adrian@suse.de -- add patch from abauer to fix cookie handling bnc#378421 +- add patch from abauer to fix cookie handling (bnc#378421) ------------------------------------------------------------------- Wed Apr 2 16:36:40 CEST 2008 - poeml@suse.de @@ -26,11 +116,11 @@ Tue Apr 1 09:43:12 CEST 2008 - poeml@suse.de Newly introduced options are: * osc checkout: --expand-link * osc update: --expand-link and --unexpand-link - - osc build: add --debuginfo switch (Thanks, Juergen!) [#368524] + - osc build: add --debuginfo switch (Thanks, Juergen!) [bnc#368524] - osc req: add option -a / --add-header to inject arbitrary request headers - osc addremove (and others): ignore _all_ dot files (the - buildservice doesn't handle them) [#370476] + buildservice doesn't handle them) [bnc#370476] - copypac: do a server-side copy (via a single api call) when used with -s / --server-side. - prjresults: csv export uses ';' as default (Pavol) diff --git a/osc.dsc b/osc.dsc index 0329916..10081cf 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.9-1 +Version: 0.100-1 Binary: osc Maintainer: Rene Engelhard Architecture: any diff --git a/osc.spec b/osc.spec index a8b374c..e723ba0 100644 --- a/osc.spec +++ b/osc.spec @@ -1,5 +1,5 @@ # -# spec file for package osc (Version 0.99) +# spec file for package osc (Version 0.104) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,15 +13,14 @@ Name: osc BuildRequires: python-devel -Version: 0.99 -Release: 40 +Version: 0.104 +Release: 1 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 +# v=0.101; 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 # @@ -60,7 +59,6 @@ Authors: %prep %setup -q -n osc-%{version} -%patch %build CFLAGS="%{optflags}" \ @@ -82,8 +80,77 @@ mkdir -p %{buildroot}/var/lib/osc-plugins %doc README TODO NEWS %changelog +* Wed Jun 11 2008 poeml@suse.de +- update to r4164 (version 0.104): + - osc update: after update, reset the revision when updating + multiple package. Fixes "404: Not Found" type errors when + updating an entire project. [bnc#399177] + - more/better error messages in some error scenarios + - osc wipebinaries: add missing check for commandline arguments, + which could cause a PACKAGE argument to be ignored + - fixed make_diff in order to avoid errors when committing a new + package (created with mkpac) +* Fri Jun 06 2008 poeml@suse.de +- update to r4120 (version 0.103): + - osc submitreq create: simplify by make osc guess needed + parameters, if there is a working copy and it is a source link. + - osc submitreq create: don't stop on packages that have a devel + project defined, if the submit actually comes from that + project. + - osc checkout: checkout of source links is now done in expanded + form per default. The new option --unexpand-link can be used to + get the raw link file. + - show the API's error message for HTTP 403 (Forbidden) replies. +* Tue Jun 03 2008 poeml@suse.de +- update to r4089 (version 0.102) + - osc branch: Show the actually created branch project name, not + a guessed one. Add --nodevelproject. + - osc submitreq: look up the develproject of the target, and if + there is one, don't create the request, unless forced with + --nodevelproject. + - when -d (global, for debug) was used, save the body because it can't be read twice +* Tue May 27 2008 poeml@suse.de +- update to r4030: + - version 0.101 + - add osc branch command, using the branch API call to branch a package to + home:poeml:branches:PRJ/PKG + - osc commit now opens $EDITOR for commit message + - improved error handling, when API returns HTTP status code 400 (bad request) + - osc status: implement -q/--quiet switch + - osc info: slightly more verbose + - osc deletepac: allow deletion of multiple packages at once + - make "osc meta prjconf -e" work again (probably caused by r3702) +* Tue May 20 2008 poeml@suse.de +- update to r4002: + - osc maintainer: new -D/--devel-project switch + - osc rprjresults/rresults: small fixes + - facilitate correct syntax highlighting when editing metadata +* Mon May 19 2008 poeml@suse.de +- update to r3995: + - version 0.100 + - improved error handling (babysitter.py wrapper, oscerr.py exception classes) + Tracebacks are mostly suppressed now. To enable them, use + | -t, --traceback print call trace in case of errors + or set traceback=1 in .oscrc. + - other new global options for debugging: + | --debugger jump into the debugger before executing anything + | --post-mortem jump into the debugger in case of errors + | -d, --debug print info useful for debugging + - make way for more seamless osc version updates (the .osc directory in working copies + will have its own versioning in the future) + - osc rprjresults and osc rresults: new commands to show remote build results + - osc build: added --baselibs and --jobs options + - osc copypac: added --keep-maintainers switch + - BUILD_DIST environment variable will be ignored (bnc#359846) + The following environment variables can still be used: + * OSC_SU_WRAPPER overrides the setting of su-wrapper. + * OSC_BUILD_ROOT overrides the setting of build-root. + * OSC_PACKAGECACHEDIR overrides the setting of packagecachedir. + - a few bug fixes. +* Mon Apr 21 2008 poeml@suse.de +- remove the patch added by Adrian (bnc#378421) * Sat Apr 12 2008 adrian@suse.de -- add patch from abauer to fix cookie handling bnc#378421 +- 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 @@ -102,11 +169,11 @@ mkdir -p %{buildroot}/var/lib/osc-plugins Newly introduced options are: * osc checkout: --expand-link * osc update: --expand-link and --unexpand-link - - osc build: add --debuginfo switch (Thanks, Juergen!) [#368524] + - osc build: add --debuginfo switch (Thanks, Juergen!) [bnc#368524] - osc req: add option -a / --add-header to inject arbitrary request headers - osc addremove (and others): ignore _all_ dot files (the - buildservice doesn't handle them) [#370476] + buildservice doesn't handle them) [bnc#370476] - copypac: do a server-side copy (via a single api call) when used with -s / --server-side. - prjresults: csv export uses ';' as default (Pavol)