Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2017-06-12 15:36:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner" Mon Jun 12 15:36:11 2017 rev:43 rq:503031 version:0.9.7 Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2017-06-08 16:38:35.905364661 +0200 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2017-06-12 15:36:19.627396124 +0200 @@ -1,0 +2,6 @@ +Mon Jun 12 09:00:49 UTC 2017 - [email protected] + +- Version update to 0.9.7: + * Fix help parsing that crashed the app on execution + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.9.6.tar.gz New: ---- spec-cleaner-0.9.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.JM6iFL/_old 2017-06-12 15:36:22.051054280 +0200 +++ /var/tmp/diff_new_pack.JM6iFL/_new 2017-06-12 15:36:22.055053716 +0200 @@ -20,7 +20,7 @@ # This is used for Fedora, we need to sync this %{!?py3_ver: %define py3_ver %{python3_version}} Name: spec-cleaner -Version: 0.9.6 +Version: 0.9.7 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-0.9.6.tar.gz -> spec-cleaner-0.9.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.6/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.9.6/spec_cleaner/__init__.py 2017-06-08 13:14:12.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/__init__.py 2017-06-11 20:26:23.000000000 +0200 @@ -12,7 +12,7 @@ from .rpmcleaner import RpmSpecCleaner -__version__ = '0.9.6' +__version__ = '0.9.7' def process_args(argv): @@ -43,7 +43,7 @@ parser.add_argument('-m', '--minimal', action='store_true', help='run in minimal mode that does not do anything intrusive (ie. just sets the Copyright)') parser.add_argument('--no-curlification', action='store_true', - help='do not convert variables bracketing (%{macro}) and keep it as it was on the input') + help='do not convert variables bracketing (%%{macro}) and keep it as it was on the input') parser.add_argument('--no-copyright', action='store_true', help='do not include official SUSE copyright hear and just keep what is present') output_group.add_argument('-o', '--output', default='', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.6/spec_cleaner/dependency_parser.py new/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/dependency_parser.py --- old/spec-cleaner-spec-cleaner-0.9.6/spec_cleaner/dependency_parser.py 2017-06-08 13:14:12.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.9.7/spec_cleaner/dependency_parser.py 2017-06-11 20:26:23.000000000 +0200 @@ -9,7 +9,8 @@ state_types = ['start', 'name', 'operator', 'version'] -re_parens = re.compile( +re_brackets = {} +re_brackets['('] = re.compile( r'(' + r'\(' + r'|' + r'\)' + r'|' + r'\\(' + r'|' + r'\\)' + r'|' + @@ -17,7 +18,7 @@ r')' ) -re_braces = re.compile( +re_brackets['{'] = re.compile( r'(' + r'\{' + r'|' + r'\}' + r'|' + r'\\{' + r'|' + r'\\}' + r'|' + @@ -35,7 +36,7 @@ # Switch to logging.DEBUG if needed logger.setLevel(logging.ERROR) -def find_end_of_macro(string, regex, opening, closing): +def find_end_of_bracketed_macro(string, regex, opening, closing): macro = string[0:2] # eat '%{' string = string[2:] @@ -69,21 +70,21 @@ raise NoMatchException('Expected match failed (string: "%s", regex: "%s" )' % (string, regex.pattern)) def read_boolean(string): - return find_end_of_macro(string, re_parens, '(', ')') + return find_end_of_bracketed_macro(string, re_brackets['('], '(', ')') -def read_macro(string): - if string[1] == '{': - regex = re_braces - opening = '{' - closing = '}' - elif string[1] == '(': - regex = re_parens - opening = '(' - closing = ')' - else: - raise Exception('Unexpected character') +def matching_bracket(bracket): + if bracket == '{': + return '}' + elif bracket == '(': + return ')' + raise Exception("Undefined bracket matching - add defintion of '%s' to " + "matching_bracket()" % bracket) - return find_end_of_macro(string, regex, opening, closing) +def read_macro(string): + opening = string[1] + closing = matching_bracket(opening) + return find_end_of_bracketed_macro( + string, re_brackets[opening], opening, closing) def read_next_chunk(string): chunk = '' ++++++ spec-cleaner.dsc ++++++ --- /var/tmp/diff_new_pack.JM6iFL/_old 2017-06-12 15:36:22.291020435 +0200 +++ /var/tmp/diff_new_pack.JM6iFL/_new 2017-06-12 15:36:22.295019870 +0200 @@ -1,6 +1,6 @@ Format: 3.0 (quilt) Source: spec-cleaner -Version: 0.9.6-1 +Version: 0.9.7-1 Binary: spec-cleaner Maintainer: Přemysl Janouch <[email protected]> Architecture: all
