diff options
| -rwxr-xr-x | mgagnome | 16 |
1 files changed, 2 insertions, 14 deletions
@@ -522,7 +522,7 @@ class SpecFile(): ), ('make use of autopatch', r'%autopatch -p1', re.compile(r'^%apply_patches$', re.MULTILINE)), ('change configure2_5x macro to configure', r'%configure', re.compile(r'^%configure2_5x\b', re.MULTILINE)), - ('change make macro to make_build', r'%make_build', re.compile(r'^%make\b', re.MULTILINE), True), + ('change make macro to make_build', r'%make_build', re.compile(r'^%make\b', re.MULTILINE)), ( 'change find_lang --with-help into --with-gnome', r'\g<keeppre> --with-gnome\g<keeppost>', @@ -546,12 +546,7 @@ class SpecFile(): made_changes = False with open(self.path, "r", encoding="utf-8") as fp_spec: data = fp_spec.read() - for reason, change_to, regexp, *extra in re_clean_spec: - if extra: - should_rebuild = extra[0] - else: - should_rebuild = False - + for reason, change_to, regexp in re_clean_spec: if change_to is None: change_to = "" @@ -563,8 +558,6 @@ class SpecFile(): if subs: made_changes = True self._changes['SILENT %s' % reason] = True - if should_rebuild: - self._should_rebuild = True made_changes, data = self._clean_spec_py_requires(made_changes, data) @@ -1942,13 +1935,8 @@ def _cmd_clean_spec_multi(args): if made_changes: if options.doit: Downstream.checkin(package, spec.changes, cwd=cwd) - if spec.should_rebuild: - cmd = ['mgagnome', 'rebuild', '-s', '-m', 'to test removal of deprecated macros', package] - subprocess.call(cmd, cwd=cwd) else: # show the diff and undo all changes - if spec.should_rebuild: - print("NOTICE: Package should be rebuilt") print(spec.changes) spec.ensure_no_local_changes(force=True) |