Hello community,
here is the log from the commit of package obs-service-refresh_patches for
openSUSE:Factory checked in at 2013-12-10 17:44:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-03 10:30:19.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-refresh_patches.new/obs-service-refresh_patches.changes
2013-12-10 17:44:09.000000000 +0100
@@ -1,0 +2,27 @@
+Tue Dec 10 09:34:28 UTC 2013 - speili...@suse.com
+
+- Update to version 0.3.5+git.1386667973.d5e8213:
+ + Rework fuzz detection
+ + Pass --fuzz=0 to "quilt setup"
+ + Do not list twice patches in .changes entry
+ + Switch to C locale to avoid parsing localized output
+
+-------------------------------------------------------------------
+Mon Dec 9 14:08:43 UTC 2013 - speili...@suse.com
+
+- Update to version 0.3.4.1+git.1386598065.93569e2:
+ + Support quilt on SLE_11
+
+-------------------------------------------------------------------
+Mon Dec 9 13:20:43 UTC 2013 - speili...@suse.com
+
+- Update to version 0.3.4+git.1386595051.c3f87d4:
+ + Fix %pre section patch regex
+
+-------------------------------------------------------------------
+Tue Nov 26 13:50:59 UTC 2013 - speili...@suse.com
+
+- Update to version 0.3.3+git.1385473723.13c63f4:
+ + Whitespaces handling in OSCRC_EMAIL regexp
+
+-------------------------------------------------------------------
Old:
----
obs-service-refresh_patches-0.3.2+git.1385463523.dfec30c.tar.gz
New:
----
obs-service-refresh_patches-0.3.5+git.1386667973.d5e8213.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-refresh_patches.spec ++++++
--- /var/tmp/diff_new_pack.9OlY8r/_old 2013-12-10 17:44:10.000000000 +0100
+++ /var/tmp/diff_new_pack.9OlY8r/_new 2013-12-10 17:44:10.000000000 +0100
@@ -19,7 +19,7 @@
%define service refresh_patches
Name: obs-service-%{service}
-Version: 0.3.2+git.1385463523.dfec30c
+Version: 0.3.5+git.1386667973.d5e8213
Release: 0
Summary: An OBS source service: Refreshs local patches
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.9OlY8r/_old 2013-12-10 17:44:10.000000000 +0100
+++ /var/tmp/diff_new_pack.9OlY8r/_new 2013-12-10 17:44:10.000000000 +0100
@@ -1,12 +1,12 @@
<services>
<service mode="disabled" name="tar_scm">
- <param
name="url">g...@github.com:openSUSE/obs-service-refresh_patches.git</param>
+ <param
name="url">https://github.com/openSUSE/obs-service-refresh_patches.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="version">git-master</param>
<param name="versionformat">@PARENT_TAG@+git.%ct.%h</param>
<param name="revision">master</param>
- <!--<param name="changesgenerate">enable</param>-->
+ <param name="changesgenerate">enable</param>
</service>
<service mode="disabled" name="recompress">
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.9OlY8r/_old 2013-12-10 17:44:10.000000000 +0100
+++ /var/tmp/diff_new_pack.9OlY8r/_new 2013-12-10 17:44:10.000000000 +0100
@@ -1,5 +1,6 @@
<servicedata>
<service name="tar_scm">
- <param
name="url">g...@github.com:openSUSE/obs-service-refresh_patches.git</param>
- <param name="changesrevision">dfec30c761</param></service>
+ <param
name="url">https://github.com/openSUSE/obs-service-refresh_patches.git</param>
+ <param name="changesrevision">d5e8213995</param>
+ </service>
</servicedata>
\ No newline at end of file
++++++ obs-service-refresh_patches-0.3.2+git.1385463523.dfec30c.tar.gz ->
obs-service-refresh_patches-0.3.5+git.1386667973.d5e8213.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-refresh_patches-0.3.2+git.1385463523.dfec30c/refresh_patches
new/obs-service-refresh_patches-0.3.5+git.1386667973.d5e8213/refresh_patches
---
old/obs-service-refresh_patches-0.3.2+git.1385463523.dfec30c/refresh_patches
2013-11-26 12:00:11.000000000 +0100
+++
new/obs-service-refresh_patches-0.3.5+git.1386667973.d5e8213/refresh_patches
2013-12-10 10:34:28.000000000 +0100
@@ -24,19 +24,20 @@
import sys
-OSC_EMAIL_RE = re.compile(r"\s*email=(.*)$")
+OSC_EMAIL_RE = re.compile(r"\s*email\s*=\s*(.*)$")
QUILT_SETUP_PATCHES_RE = re.compile(r".*### rpmbuild: tp+")
QUILT_SETUP_SUCCESS_RE = re.compile(r".*Unpacking archive .*$")
+QUILT_PUSH_FUZZ_RE = re.compile(r".*Hunk #\d+ succeeded at \d+ with fuzz
\d+.*\..*Now at patch (.*)$")
QUILT_PUSH_OFFSET_RE = re.compile(r".*Hunk #\d+ succeeded at \d+ .*\..*Now at
patch (.*)$")
QUILT_PUSH_SUCCESS_RE = re.compile(r".*Now at patch (.*)$")
QUILT_PUSH_ERROR_RE = re.compile(r".*Patch .* does not apply \(enforce with
-f\)$")
-QUILT_PUSH_REVERSE_RE = re.compile(r".*Patch (.*) can be reverse-applied$")
+QUILT_PUSH_REVERSE_RE = re.compile(r".*Patch (?:patches/)?(.*) can be
reverse-applied$")
QUILT_REFRESH_SUCCESS_RE = re.compile(r".*Refreshed patch (.*)")
QUILT_SUCCESS_RE = re.compile(r".*File series fully applied, ends at (.*)$")
SPEC_PATCH_PREAMBLE_RE_TEMPLATE = r"Patch(\d+):\s*{0}" # Needs patch name,
group(1) returns patch number
-SPEC_PATCH_PRE_SECTION_RE_TEMPLATE = r"%patch{0}.*" # Needs patch number, ^
+SPEC_PATCH_PRE_SECTION_RE_TEMPLATE = r"%patch{0}\s+.*" # Needs patch number, ^
PATCH_ENDINGS = ["patch", "diff", "dif"]
@@ -137,6 +138,10 @@
help='osc service parameter that does nothing')
args = parser.parse_args()
+ # Switch to C locale since we're parsing output of localized commands
+ os.environ['LC_ALL'] = 'C'
+ os.environ['LANG'] = 'C'
+
# Check if there are patch files present, otherwise the service doesn't
need to run:
have_patches = False
for filename in os.listdir("."):
@@ -183,9 +188,12 @@
if match: # We're done
print("Finished refreshing patches for
{0}".format(specfile))
break
+ match = QUILT_PUSH_FUZZ_RE.match(output_oneline)
+ if match: # Manual intervention needed
+ raise QuiltException(output)
match = QUILT_PUSH_OFFSET_RE.match(output_oneline)
if match: # Oh, got something to refresh
- patch_name = match.groups(1)[0]
+ patch_name = os.path.basename(match.groups(1)[0])
print("Patch {0} refreshed".format(patch_name))
output2 = silent_popen(["quilt", "refresh"])
match2 = QUILT_REFRESH_SUCCESS_RE.match(output2)
@@ -195,7 +203,7 @@
continue
match = QUILT_PUSH_REVERSE_RE.match(output_oneline)
if match: # Patch was fully merged, mark it for dropping
- patch_name = match.groups(1)[0]
+ patch_name = os.path.basename(match.groups(1)[0])
try:
os.chdir(src_dir)
silent_popen(["osc", "rm", patch_name])
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
