diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-06-27 18:12:01 +0300 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-11-14 14:46:24 +0200 |
| commit | eccb50be944f62264415c534aa8d649d9011f6ae (patch) | |
| tree | 10dfe34acb52237de4e9c185feadd8710403f8ae /gbp/config.py | |
| parent | 14aef925c9eeb46c909d49b2271ef4c64eb747c8 (diff) | |
| download | git-buildpackage-eccb50be944f62264415c534aa8d649d9011f6ae.tar.gz git-buildpackage-eccb50be944f62264415c534aa8d649d9011f6ae.tar.bz2 git-buildpackage-eccb50be944f62264415c534aa8d649d9011f6ae.zip | |
import-srpm: support for patch import
Adds a new commandline option '--patch-import' for importing patches
into the source tree in packaging branch. When enabled, gbp applies and
commits all patches (not marked for manual maintenance) into the
packaging branch. If this succeeds, it also removes all imported patch
files from the packaging directory and the spec file.
Currently only supported for non-orphan-packaging.
This setting is true by default which should make more sense as the
developer wants to do code development in the packaging branch (if
he/she selects to use non-orphan packaging).
However, patch-import is force-disabled if in bare git repository. We
cannot support this, currently.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/config.py')
| -rw-r--r-- | gbp/config.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gbp/config.py b/gbp/config.py index fdfc66c7..2c4917a3 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -613,6 +613,7 @@ class GbpOptionParserRpm(GbpOptionParser): 'patch-export-compress' : '0', 'patch-export-ignore-path' : '', 'patch-export-squash-until' : '', + 'patch-import' : 'True', 'spec-vcs-tag' : '', 'merge' : 'False', 'pristine-tarball-name' : 'auto', @@ -660,6 +661,9 @@ class GbpOptionParserRpm(GbpOptionParser): "Squash commits (from upstream) until given tree-ish into one " "big diff, format is '<commit_ish>[:<filename_base>]'. " "Default is '%(patch-export-squash-until)s'", + 'patch-import': + "Import patches to the packaging branch, default is " + "'%(patch-import)s'", 'spec-vcs-tag': "Set/update the 'VCS:' tag in the spec file, empty value " "removes the tag entirely, default is '%(spec-vcs-tag)s'", |