Ignore .gbs.conf in patch-generation
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Fri, 23 Nov 2012 09:26:19 +0000 (11:26 +0200)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Fri, 23 Nov 2012 09:26:19 +0000 (11:26 +0200)
The package-specific configuration file can be seen as a packaging
files. Don't generate patches that add/modify .gbs.conf.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
gitbuildsys/cmd_export.py

index 18ed8f490c3a4b68bdd5c773a26d30d74f77d4e7..054d1fa336f7639b0e4b6fcb1632caac1f58deea 100644 (file)
@@ -111,7 +111,8 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args,
                      "--git-force-create",
                      "--git-patch-export-squash-until=%s" %
                             squash_patches_until,
-                     "--git-patch-export-ignore-path=^packaging/.*"])
+                     "--git-patch-export-ignore-path="
+                            "^(packaging/.*|.gbs.conf)"])
         if repo.has_branch("pristine-tar"):
             argv.extend(["--git-pristine-tar"])