diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-06-11 10:28:32 +0300 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-06-11 10:28:32 +0300 |
| commit | 2efc87ca0f95b3625e18bf428b90ec05e70ec7c5 (patch) | |
| tree | fe0ecd9de9291503c9075f48089e0a0c8798c808 | |
| parent | 2f5ef6554de34f64f3f6bea14571b9448437dbe5 (diff) | |
| download | git-buildpackage-2efc87ca0f95b3625e18bf428b90ec05e70ec7c5.tar.gz git-buildpackage-2efc87ca0f95b3625e18bf428b90ec05e70ec7c5.tar.bz2 git-buildpackage-2efc87ca0f95b3625e18bf428b90ec05e70ec7c5.zip | |
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>
| -rwxr-xr-x | gbp/scripts/import_srpm.py | 3 | ||||
| -rwxr-xr-x | gbp/scripts/pq_rpm.py | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py index 49c1b12a..4e45c76d 100755 --- 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 8366dd62..f5957404 100755 --- 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) |