commit obs-service-refresh_patches for openSUSE:Factory
Hello community, here is the log from the commit of package obs-service-refresh_patches for openSUSE:Factory checked in at 2014-01-22 23:20:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-refresh_patches (Old) and /work/SRC/openSUSE:Factory/.obs-service-refresh_patches.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-refresh_patches" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-refresh_patches/obs-service-refresh_patches.changes 2013-12-10 17:44:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-refresh_patches.new/obs-service-refresh_patches.changes 2014-01-23 15:50:11.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Jan 17 13:08:48 UTC 2014 - speilicke@suse.com + +- Update to version 0.3.6+git.1389964042.5343549: + + Introduce "--ignorefuzz" argument + +------------------------------------------------------------------- Old: ---- obs-service-refresh_patches-0.3.5+git.1386667973.d5e8213.tar.gz New: ---- obs-service-refresh_patches-0.3.6+git.1389964042.5343549.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-refresh_patches.spec ++++++ --- /var/tmp/diff_new_pack.3Ealsl/_old 2014-01-23 15:50:11.000000000 +0100 +++ /var/tmp/diff_new_pack.3Ealsl/_new 2014-01-23 15:50:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package obs-service-refresh_patches # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define service refresh_patches Name: obs-service-%{service} -Version: 0.3.5+git.1386667973.d5e8213 +Version: 0.3.6+git.1389964042.5343549 Release: 0 Summary: An OBS source service: Refreshs local patches License: Apache-2.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.3Ealsl/_old 2014-01-23 15:50:11.000000000 +0100 +++ /var/tmp/diff_new_pack.3Ealsl/_new 2014-01-23 15:50:11.000000000 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/obs-service-refresh_patches.git</param> - <param name="changesrevision">d5e8213995</param> + <param name="changesrevision">5343549f89</param> </service> </servicedata> \ No newline at end of file ++++++ obs-service-refresh_patches-0.3.5+git.1386667973.d5e8213.tar.gz -> obs-service-refresh_patches-0.3.6+git.1389964042.5343549.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-refresh_patches-0.3.5+git.1386667973.d5e8213/refresh_patches new/obs-service-refresh_patches-0.3.6+git.1389964042.5343549/refresh_patches --- old/obs-service-refresh_patches-0.3.5+git.1386667973.d5e8213/refresh_patches 2013-12-10 10:34:28.000000000 +0100 +++ new/obs-service-refresh_patches-0.3.6+git.1389964042.5343549/refresh_patches 2014-01-17 14:08:47.000000000 +0100 @@ -134,6 +134,7 @@ parser = argparse.ArgumentParser(description="Refresh Patches") parser.add_argument("--changesgenerate", help="Whether or not to generate changes file entries from SCM commit log since a given parent revision (see changesrevision). Default is 'disable'.") parser.add_argument("--changesauthor", help="The author of the changes file entry to be written, defaults to first email entry in ~/.oscrc or \"opensuse-packaging@opensuse.org\" if there is no .oscrc found.") + parser.add_argument("--ignorefuzz", help="The service stops when 'quilt patch' only works with fuzz. Set this flag to 'enable' if you want to refresh patches regardless of fuzz.") parser.add_argument('--outdir', help='osc service parameter that does nothing') args = parser.parse_args() @@ -190,7 +191,8 @@ break match = QUILT_PUSH_FUZZ_RE.match(output_oneline) if match: # Manual intervention needed - raise QuiltException(output) + if args.ignorefuzz != "enable": + raise QuiltException(output) match = QUILT_PUSH_OFFSET_RE.match(output_oneline) if match: # Oh, got something to refresh patch_name = os.path.basename(match.groups(1)[0]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-refresh_patches-0.3.5+git.1386667973.d5e8213/refresh_patches.service new/obs-service-refresh_patches-0.3.6+git.1389964042.5343549/refresh_patches.service --- old/obs-service-refresh_patches-0.3.5+git.1386667973.d5e8213/refresh_patches.service 2013-12-09 14:19:39.000000000 +0100 +++ new/obs-service-refresh_patches-0.3.6+git.1389964042.5343549/refresh_patches.service 2014-01-17 14:08:47.000000000 +0100 @@ -9,6 +9,11 @@ <param name="changesauthor"> <description>The author of the changes file entry to be written, defaults to first email entry in ~/.oscrc or "opensuse-packaging@opensuse.org" if there is no .oscrc found.</description> </param> + <param name="ignorefuzz"> + <description>The service stops when 'quilt patch' only works with fuzz. Set this flag to 'enable' if you want to refresh patches regardless of fuzz.</description> + <allowedvalue>enable</allowedvalue> + <allowedvalue>disable</allowedvalue> + </param> </service> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de