import_srpm: update the commit message as the old version.

Change-Id: I4d13e65151314b96f6d80fea44771f3cea205e34
Signed-off-by: wanchao-xu <wanchao.xu@samsung.com>

diff --git a/gbp/config.py b/gbp/config.py
index 23981712900857ddcbbb8b65218f086968463150..fc8c234e9b560047231833d7612b39e5cb8e6f87 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -146,7 +146,7 @@ class GbpOptionParser(OptionParser):
                 'ignore-branch': 'False',
                 'ignore-new': 'False',
                 'ignore-regex': '',
-                'import-msg': 'New upstream version %(version)s',
+                'import-msg': 'Imported Upstream version %(version)s',
                 'interactive': 'True',
                 'keyid': '',
                 'merge': 'True',

diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py
index 5e4c7571e0e1edbe6c63811cdbdcfeee280c19da..a1ed8afa1e2f452a148c8ae55ac92a52ccfc3c3a 100755 (executable)
--- a/gbp/scripts/import_srpm.py
+++ b/gbp/scripts/import_srpm.py
@@ -451,7 +451,7 @@ def main(argv):
                 else:
                     parents = None
                 upstream_commit = repo.commit_dir(sources.unpacked,
-                                                  "Import %s" % msg,
+                                                  "Imported %s" % msg,
                                                   branch,
                                                   other_parents=parents,
                                                   author=author,
@@ -495,7 +495,7 @@ def main(argv):
 
             if options.orphan_packaging or not sources:
                 commit = repo.commit_dir(dirs['packaging_base'],
-                                         "Import %s" % msg,
+                                         "Imported %s" % msg,
                                          branch,
                                          author=author,
                                          committer=committer,
@@ -513,7 +513,7 @@ def main(argv):
                     shutil.copy2(os.path.join(dirs['packaging'], fname),
                                  pkgsubdir)
                 commit = repo.commit_dir(sources.unpacked,
-                                         "Import %s" % msg,
+                                         "Imported %s" % msg,
                                          branch,
                                          other_parents=[upstream_commit],
                                          author=author,