Don't modify spec file when importing

Now GBP doesn't automatically add patch autoupdate markers anymore.

Change-Id: Ia40851d000c7ea3d576ce72d26a8dbb3c5d5dd77
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py
index 49c1b12a12eaf0676bdab8d82eb6a595ef5e692f..4e45c76d01c9efdff7190777c51cf3e670a4aa19 100755 (executable)
--- a/gbp/scripts/import_srpm.py
+++ b/gbp/scripts/import_srpm.py
@@ -340,9 +340,6 @@ def main(argv):
                 try:
                     dummy, specfile = guess_spec(options.packaging_dir)
                     spec = SpecFile(specfile)
-                    if spec.putautoupdatemarkers() != 0:
-                        gbpc.GitCommand('status')(['--', options.packaging_dir])
-                        gbp.log.warn("Auto-added gbp autoupdate markers to spec file. Verifying the changes manually before git commit is recommended.")
                 except NoSpecError, err:
                     gbp.log.warn("Unable to find .spec file to add autoupdate markers ('%s')" % err)
 

diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index 8366dd6264b1fc57456ba591aa2b48238303d78c..f59574042f4d8d6ef42c0ddc6218f346e5b588eb 100755 (executable)
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -197,9 +197,6 @@ def import_spec_patches(repo, branch, tries, options):
 
     # Edit spec file
     repo.set_branch(branch)
-    if spec.putautoupdatemarkers() != 0:
-      GitCommand('status')(['--', options.packaging_dir])
-      gbp.log.warn("Auto-added gbp autoupdate markers to spec file. Checking the changes manually before git commit is recommended.")
 
     return os.path.basename(spec.specfile)