--- /dev/null
+#! /usr/bin/python -u
+import sys
+from gbp.scripts.pq_rpm import main
+
+sys.exit(main(sys.argv))
--- /dev/null
+#! /usr/bin/python -u
+import sys
+from gbp.scripts.buildpackage_rpm import main
+
+sys.exit(main(sys.argv))
--- /dev/null
+#! /usr/bin/python -u
+import sys
+from gbp.scripts.import_orig_rpm import main
+
+sys.exit(main(sys.argv))
--- /dev/null
+#! /usr/bin/python -u
+import sys
+from gbp.scripts.import_srpm import main
+
+sys.exit(main(sys.argv))
sudo "$BUILDER" --"$action" --distribution "$DIST" \
--othermirror "$OTHERMIRROR" "${OPTIONS[@]}" "$@"
else
- sudo "$BUILDER" --"$action" --distribution "$DIST" \
- "${OPTIONS[@]}" "$@"
+ sudo "$BUILDER" --"$action" --distribution "$DIST" "${OPTIONS[@]}" "$@"
fi
fi
exit $?
--- /dev/null
+#! /usr/bin/python -u
+import sys
+from gbp.scripts.rpm_ch import main
+
+sys.exit(main(sys.argv))
-- Markus Lehtonen <markus.lehtonen@linux.intel.com> Fri, 06 Feb 2015 10:36:26 +0200
+ * Upgrade version to 0.6.25
+
+ -- Rong Jinhui <jinhui.rong@samsung.com> Thu, 04 Aug 2015 08:53:30 +0800
+
+git-buildpackage (0.6.15-tizen20140828) unstable; urgency=low
+
+ [ Markus Lehtonen ]
+ * Rebase on top of upstream version 0.6.15
+ * Changes in buildpackage-rpm
+ - new 'commitish' keyword for spec vcs tag
+ - notify: catch RuntimeError when importing pynotify
+ - fix exit code in case of GitRepositoryError
+ - always create tarball for native packages
+ - check submodules from the exported treeish
+ - fix crash when running prebuild hook
+ - always run cleaner hook
+ - add --git-no-build option
+ - don't crash on invalid vcs format strings
+ - add '--git-native' option
+ - remove some outdated/unnecessary exception handling
+ - get rid of prepare_export_dir()
+ - handle invalid keys in orig prefix
+ - internal refactoring and fixes
+ * Changes in rpm-ch
+ - implement --commit option
+ - implement --commit-msg option
+ - rpm-ch: implement --meta-bts option
+ - rpm.policy: don't allow leading whitespace in bts meta tags
+ * docs: manpages for the rpm tools
+ * Misc. fixes and features
+ - buildpackage: refactor tarball compression
+ - gbp-dch: fix handling of the '--meta' option
+ - import-orig-rpm: download tarball into parent directory
+ - GitRepository/has_submodules: add treeish argument
+ - tristate: implement __nonzero__() method
+ * Logging:
+ - don't automatically setup gbp-specific logger
+ - fix auto colorizing for custom streams
+ * Tests
+ - multiple fixes and additions in ComponentTestBase class
+ - testutils: add directories arg to ls_* functions
+ - add unit tests for buildpackage-rpm
+ * Packaging
+ - rpm-packaging: recommend/require unzip
+ - recommend/require zipmerge
+ - depend/recommend rpmbuild
+
+ [ Junchun Guan ]
+ * Add PKGBUILD to support arch linux
+
+ [ Li Jinjing ]
+ * rpm packaging: use macro for python binary
+
+ -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Thu, 28 Aug 2014 11:40:05 +0300
git-buildpackage (0.6.22) unstable; urgency=medium
* [3d8939d] git.vfs: fix close method. Preventing a infinite recursion
-- Guido Günther <agx@sigxcpu.org> Mon, 28 Jul 2014 15:57:49 +0200
-git-buildpackage (0.6.15-tizen20140828) unstable; urgency=low
-
- [ Markus Lehtonen ]
- * Rebase on top of upstream version 0.6.15
- * Changes in buildpackage-rpm
- - new 'commitish' keyword for spec vcs tag
- - notify: catch RuntimeError when importing pynotify
- - fix exit code in case of GitRepositoryError
- - always create tarball for native packages
- - check submodules from the exported treeish
- - fix crash when running prebuild hook
- - always run cleaner hook
- - add --git-no-build option
- - don't crash on invalid vcs format strings
- - add '--git-native' option
- - remove some outdated/unnecessary exception handling
- - get rid of prepare_export_dir()
- - handle invalid keys in orig prefix
- - internal refactoring and fixes
- * Changes in rpm-ch
- - implement --commit option
- - implement --commit-msg option
- - rpm-ch: implement --meta-bts option
- - rpm.policy: don't allow leading whitespace in bts meta tags
- * docs: manpages for the rpm tools
- * Misc. fixes and features
- - buildpackage: refactor tarball compression
- - gbp-dch: fix handling of the '--meta' option
- - import-orig-rpm: download tarball into parent directory
- - GitRepository/has_submodules: add treeish argument
- - tristate: implement __nonzero__() method
- * Logging:
- - don't automatically setup gbp-specific logger
- - fix auto colorizing for custom streams
- * Tests
- - multiple fixes and additions in ComponentTestBase class
- - testutils: add directories arg to ls_* functions
- - add unit tests for buildpackage-rpm
- * Packaging
- - rpm-packaging: recommend/require unzip
- - recommend/require zipmerge
- - depend/recommend rpmbuild
-
- [ Junchun Guan ]
- * Add PKGBUILD to support arch linux
-
- [ Li Jinjing ]
- * rpm packaging: use macro for python binary
-
- -- Markus Lehtonen <markus.lehtonen@linux.intel.com> Thu, 28 Aug 2014 11:40:05 +0300
-
git-buildpackage (0.6.15) unstable; urgency=medium
* [5cde49a] Revert "Determine build_dir upfront"
usr/bin/gbp
usr/bin/gbp-clone
usr/bin/gbp-pull
-usr/lib/python2.?/dist-packages/gbp-*
-usr/lib/python2.?/dist-packages/gbp/command_wrappers.py
-usr/lib/python2.?/dist-packages/gbp/config.py
-usr/lib/python2.?/dist-packages/gbp/errors.py
-usr/lib/python2.?/dist-packages/gbp/format.py
-usr/lib/python2.?/dist-packages/gbp/git/
-usr/lib/python2.?/dist-packages/gbp/__init__.py
-usr/lib/python2.?/dist-packages/gbp/log.py
-usr/lib/python2.?/dist-packages/gbp/notifications.py
-usr/lib/python2.?/dist-packages/gbp/patch_series.py
-usr/lib/python2.?/dist-packages/gbp/pkg/
-usr/lib/python2.?/dist-packages/gbp/scripts/clone.py
-usr/lib/python2.?/dist-packages/gbp/scripts/common/
-usr/lib/python2.?/dist-packages/gbp/scripts/config.py
-usr/lib/python2.?/dist-packages/gbp/scripts/__init__.py
-usr/lib/python2.?/dist-packages/gbp/scripts/pull.py
-usr/lib/python2.?/dist-packages/gbp/scripts/supercommand.py
-usr/lib/python2.?/dist-packages/gbp/tmpfile.py
-usr/lib/python2.?/dist-packages/gbp/tristate.py
-usr/lib/python2.?/dist-packages/gbp/version.py
+usr/lib/python*/dist-packages/gbp/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/__init__.py*
+usr/lib/python*/dist-packages/gbp/scripts/clone.py*
+usr/lib/python*/dist-packages/gbp/scripts/config.py*
+usr/lib/python*/dist-packages/gbp/scripts/pull.py*
+usr/lib/python*/dist-packages/gbp/scripts/supercommand.py*
+usr/lib/python*/dist-packages/gbp/scripts/common/*.py*
+usr/lib/python*/dist-packages/gbp/git/*.py*
+usr/lib/python*/dist-packages/gbp/pkg/*.py*
etc/git-buildpackage/gbp.conf
-usr/lib/python2.?/dist-packages/gbp/rpm/
-usr/lib/python2.?/dist-packages/gbp/scripts/*rpm*.py*
+usr/bin/*rpm*
+usr/lib/python*/dist-packages/gbp/rpm/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/*rpm*.py*
usr/bin/git-import-orig
usr/bin/git-pbuilder
usr/bin/gbp-create-remote-repo
-usr/lib/python2.?/dist-packages/gbp/dch.py
-usr/lib/python2.?/dist-packages/gbp/deb/
-usr/lib/python2.?/dist-packages/gbp/scripts/buildpackage.py
-usr/lib/python2.?/dist-packages/gbp/scripts/create_remote_repo.py
-usr/lib/python2.?/dist-packages/gbp/scripts/dch.py
-usr/lib/python2.?/dist-packages/gbp/scripts/import_dsc.py
-usr/lib/python2.?/dist-packages/gbp/scripts/import_dscs.py
-usr/lib/python2.?/dist-packages/gbp/scripts/import_orig.py
-usr/lib/python2.?/dist-packages/gbp/scripts/pq.py
+usr/lib/python*/dist-packages/gbp/deb/*.py*
+usr/lib/python*/dist-packages/gbp/scripts/pq.py*
+usr/lib/python*/dist-packages/gbp/scripts/buildpackage.py*
+usr/lib/python*/dist-packages/gbp/scripts/dch.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_dsc.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_dscs.py*
+usr/lib/python*/dist-packages/gbp/scripts/import_orig.py*
+usr/lib/python*/dist-packages/gbp/scripts/create_remote_repo.py*
return True
return False
- @classmethod
- def guess_upstream_src_version(cls, filename, extra_regex=r''):
- """
- Guess the package name and version from the filename of an upstream
- archive.
-
- @param filename: filename (archive or directory) from which to guess
- @type filename: C{string}
- @param extra_regex: additional regex to apply, needs a 'package' and a
- 'version' group
- @return: (package name, version) or ('', '')
- @rtype: tuple
-
- >>> PkgPolicy.guess_upstream_src_version('foo-bar_0.2.orig.tar.gz')
- ('foo-bar', '0.2')
- >>> PkgPolicy.guess_upstream_src_version('foo-Bar_0.2.orig.tar.gz')
- ('foo-Bar', '0.2.orig')
- >>> PkgPolicy.guess_upstream_src_version('git-bar-0.2.tar.gz')
- ('git-bar', '0.2')
- >>> PkgPolicy.guess_upstream_src_version('git-bar-0.2-rc1.tar.gz')
- ('git-bar', '0.2-rc1')
- >>> PkgPolicy.guess_upstream_src_version('git-bar-0.2:~-rc1.tar.gz')
- ('git-bar', '0.2:~-rc1')
- >>> PkgPolicy.guess_upstream_src_version('git-Bar-0A2d:rc1.tar.bz2')
- ('git-Bar', '0A2d:rc1')
- >>> PkgPolicy.guess_upstream_src_version('git-1.tar.bz2')
- ('git', '1')
- >>> PkgPolicy.guess_upstream_src_version('kvm_87+dfsg.orig.tar.gz')
- ('kvm', '87+dfsg')
- >>> PkgPolicy.guess_upstream_src_version('foo-Bar-a.b.tar.gz')
- ('', '')
- >>> PkgPolicy.guess_upstream_src_version('foo-bar_0.2.orig.tar.xz')
- ('foo-bar', '0.2')
- >>> PkgPolicy.guess_upstream_src_version('foo-bar_0.2.tar.gz')
- ('foo-bar', '0.2')
- >>> PkgPolicy.guess_upstream_src_version('foo-bar_0.2.orig.tar.lzma')
- ('foo-bar', '0.2')
- >>> PkgPolicy.guess_upstream_src_version('foo-bar-0.2.zip')
- ('foo-bar', '0.2')
- >>> PkgPolicy.guess_upstream_src_version('foo-bar-0.2.tlz')
- ('foo-bar', '0.2')
- """
- version_chars = r'[a-zA-Z\d\.\~\-\:\+]'
- basename = parse_archive_filename(os.path.basename(filename))[0]
-
- version_filters = map ( lambda x: x % version_chars,
- ( # Debian upstream tarball: package_'<version>.orig.tar.gz'
- r'^(?P<package>[a-z\d\.\+\-]+)_(?P<version>%s+)\.orig',
- # Upstream 'package-<version>.tar.gz'
- # or Debian native 'package_<version>.tar.gz'
- # or directory 'package-<version>':
- r'^(?P<package>[a-zA-Z\d\.\+\-]+)(-|_)(?P<version>[0-9]%s*)'))
- if extra_regex:
- version_filters = extra_regex + version_filters
-
- for filter in version_filters:
- m = re.match(filter, basename)
- if m:
- return (m.group('package'), m.group('version'))
- return ('', '')
-
@staticmethod
def guess_upstream_src_version(filename, extra_regex=r''):
"""
@property
def archive_fmt(self):
"""Archive format of the sources, e.g. 'tar'"""
+ """
+ >>> UpstreamSource('foo/bar.tar.gz').archive_fmt
+ 'tar'
+ >>> UpstreamSource('foo.bar.zip').archive_fmt
+ 'zip'
+ >>> UpstreamSource('foo.bar.baz').archive_fmt
+ """
return self._archive_fmt
@property
def compression(self):
"""Compression format of the sources, e.g. 'gzip'"""
+ """
+ >>> UpstreamSource('foo/bar.tar.gz').compression
+ 'gzip'
+ >>> UpstreamSource('foo.bar.zip').compression
+ >>> UpstreamSource('foo.bz2').compression
+ 'bzip2'
+ """
return self._compression
@property
return int(val_str)
-def split_version_str(version):
- """
- Parse full version string and split it into individual "version
- components", i.e. upstreamversion, epoch and release
-
- @param version: full version of a package
- @type version: C{str}
- @return: individual version components
- @rtype: C{dict}
-
- >>> split_version_str("1")
- {'release': None, 'epoch': None, 'upstreamversion': '1'}
- >>> split_version_str("1.2.3-5.3")
- {'release': '5.3', 'epoch': None, 'upstreamversion': '1.2.3'}
- >>> split_version_str("3:1.2.3")
- {'release': None, 'epoch': '3', 'upstreamversion': '1.2.3'}
- >>> split_version_str("3:1-0")
- {'release': '0', 'epoch': '3', 'upstreamversion': '1'}
- """
- ret = {'epoch': None, 'upstreamversion': None, 'release': None}
-
- e_vr = version.split(":", 1)
- if len(e_vr) == 1:
- v_r = e_vr[0].split("-", 1)
- else:
- ret['epoch'] = e_vr[0]
- v_r = e_vr[1].split("-", 1)
- ret['upstreamversion'] = v_r[0]
- if len(v_r) > 1:
- ret['release'] = v_r[1]
-
- return ret
-
-def compose_version_str(evr):
- """
- Compose a full version string from individual "version components",
- i.e. epoch, version and release
-
- @param evr: dict of version components
- @type evr: C{dict} of C{str}
- @return: full version
- @rtype: C{str}
-
- >>> compose_version_str({'epoch': '', 'upstreamversion': '1.0'})
- '1.0'
- >>> compose_version_str({'epoch': '2', 'upstreamversion': '1.0', 'release': None})
- '2:1.0'
- >>> compose_version_str({'epoch': None, 'upstreamversion': '1', 'release': '0'})
- '1-0'
- >>> compose_version_str({'epoch': '2', 'upstreamversion': '1.0', 'release': '2.3'})
- '2:1.0-2.3'
- >>> compose_version_str({'epoch': '2', 'upstreamversion': '', 'release': '2.3'})
- """
- if 'upstreamversion' in evr and evr['upstreamversion']:
- version = ""
- if 'epoch' in evr and evr['epoch']:
- version += "%s:" % evr['epoch']
- version += evr['upstreamversion']
- if 'release' in evr and evr['release']:
- version += "-%s" % evr['release']
- if version:
- return version
- return None
-
-
# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·:
from gbp.git import GitRepository, GitRepositoryError
from gbp.pkg.pristinetar import PristineTar
-from gbp.rpm import compose_version_str
+from gbp.rpm.policy import RpmPkgPolicy
class RpmGitRepository(GitRepository):
"""A git repository that holds the source of an RPM package"""
'myvendor/v1.0-2'
"""
version_tag = format % dict(str_fields,
- version=compose_version_str(str_fields))
+ version=RpmPkgPolicy.compose_full_version(str_fields))
return RpmGitRepository._sanitize_tag(version_tag)
@staticmethod
raise
return False
-def get_upstream_tree(repo, version, options):
+def get_upstream_tree(repo, spec, options):
"""Determine the upstream tree from the given options"""
if options.upstream_tree.upper() == 'TAG':
- tag_str_fields = {"upstreamversion": version, "vendor": "Upstream"}
+ tag_str_fields = dict(upstreamversion=spec.upstreamversion, vendor="Upstream")
upstream_tree = repo.version_to_tag(options.upstream_tag, tag_str_fields)
elif options.upstream_tree.upper() == 'BRANCH':
if not repo.has_branch(options.upstream_branch):
@rtype: C{str}
"""
try:
- upstream_tree = get_upstream_tree(repo, spec.upstreamversion, options)
+ upstream_tree = get_upstream_tree(repo, spec, options)
gbp.log.info("%s does not exist, creating from '%s'" % \
(spec.orig_src['filename'], upstream_tree))
if spec.orig_src['compression']:
Generate patches and update spec file
"""
try:
- upstream_tree = get_upstream_tree(repo, spec.upstreamversion, options)
+ upstream_tree = get_upstream_tree(repo, spec, options)
update_patch_series(repo, spec, upstream_tree, export_treeish, options)
except (GitRepositoryError, GbpError) as err:
raise GbpAutoGenerateError(str(err))
break
-def packaging_tag_name(repo, version, commit_info, options):
+def packaging_tag_name(repo, spec, commit_info, options):
"""Compose packaging tag as string"""
- tag_str_fields = dict(version, vendor=options.vendor)
+ tag_str_fields = dict(spec.version, vendor=options.vendor)
update_tag_str_fields(tag_str_fields, options.packaging_tag, repo,
commit_info)
return repo.version_to_tag(options.packaging_tag, tag_str_fields)
if options.tag or options.tag_only:
gbp.log.info("Tagging %s" % RpmPkgPolicy.compose_full_version(spec.version))
commit_info = repo.get_commit_info(tree)
- tag = packaging_tag_name(repo, spec.version, commit_info, options)
+ tag = packaging_tag_name(repo, spec, commit_info, options)
if options.retag and repo.has_tag(tag):
repo.delete_tag(tag)
create_packaging_tag(repo, tag, commit=tree, version=spec.version,
if not options.tag_only:
if spec and options.notify:
summary = "Gbp-rpm %s" % ["failed", "successful"][not retval]
+ pkg_evr = {'upstreamversion': spec.version}
message = ("Build of %s %s %s" % (spec.name,
RpmPkgPolicy.compose_full_version(spec.version),
["failed", "succeeded"][not retval]))
except (OSError, IOError) as err:
raise GbpError("Error creating %s: %s" % (output, err))
-
def git_archive_submodules(repo, treeish, output, tmpdir_base, prefix,
comp_type, comp_level, comp_opts, format='tar'):
"""
if popen.wait():
raise GbpError("Error extracting tar to %s" % outdir)
-
#{ Functions to handle export-dir
def dump_tree(repo, export_dir, treeish, with_submodules, recursive=True):
"""Dump a git tree-ish to output_dir"""
# bit clearer.
gbp.log.warn("\nNot a valid upstream version: '%s'.\n%s" % (version, err_msg))
-
-def prepare_pristine_tar(source, pkg_name, pkg_version, pristine_commit_name,
- filters=None, prefix=None, tmpdir=None):
- """
- Prepare the upstream sources for pristine-tar import
-
- @param source: original upstream sources
- @type source: C{UpstreamSource}
- @param pkg_name: package name
- @type pkg_name: C{str}
- @param pkg_version: upstream version of the package
- @type pkg_version: C{str}
- @param pristine_commit_name: archive filename to commit to pristine-tar
- @type pristine_commit_name: C{str} or C{None}
- @param filters: filter to exclude files
- @type filters: C{list} of C{str} or C{None}
- @param prefix: prefix (i.e. leading directory of files) to use in
- pristine-tar, set to C{None} to not mangle orig archive
- @type prefix: C{str} or C{None}
- @param tmpdir: temporary working dir (cleanup left to caller)
- @type tmpdir: C{str}
- @return: prepared source archive
- @rtype: C{UpstreamSource}
- """
- need_repack = False
- if source.is_dir():
- if prefix is None:
- prefix = '%s-%s' % (pkg_name, pkg_version)
- gbp.log.info("Using guessed prefix '%s/' for pristine-tar" % prefix)
- need_repack = True
- else:
- if prefix is not None and prefix == source.prefix:
- prefix = None
- comp = parse_archive_filename(pristine_commit_name)[2]
- if filters or prefix is not None or source.compression != comp:
- if not source.unpacked:
- unpack_dir = tempfile.mkdtemp(prefix='pristine_unpack_',
- dir=tmpdir)
- source.unpack(unpack_dir)
- need_repack = True
- pristine_path = os.path.join(tmpdir, pristine_commit_name)
- if need_repack:
- gbp.log.debug("Packing '%s' from '%s' for pristine-tar" %
- (pristine_path, source.unpacked))
- pristine = source.pack(pristine_path, filters, prefix)
- else:
- # Just create symlink for mangling the pristine tarball name
- os.symlink(source.path, pristine_path)
- pristine = source.__class__(pristine_path)
-
- return pristine
-
-
def prepare_sources(source, pkg_name, pkg_version, pristine_commit_name,
filters, filter_pristine, prefix, tmpdir):
"""
pristine_path = pristine.path if pristine else ''
return (filtered.unpacked, pristine_path)
+def repack_source(source, new_name, unpack_dir, filters, new_prefix=None):
+ """Repack the source tree"""
+ repacked = source.pack(new_name, filters, new_prefix)
+ if source.is_tarball(): # the tarball was filtered on unpack
+ repacked.unpacked = source.unpacked
+ else: # otherwise unpack the generated tarball get a filtered tree
+ repacked.unpack(unpack_dir)
+ return repacked
+
+
+def prepare_pristine_tar(source, pkg_name, pkg_version, pristine_commit_name,
+ filters=None, prefix=None, tmpdir=None):
+ """
+ Prepare the upstream sources for pristine-tar import
+
+ @param source: original upstream sources
+ @type source: C{UpstreamSource}
+ @param pkg_name: package name
+ @type pkg_name: C{str}
+ @param pkg_version: upstream version of the package
+ @type pkg_version: C{str}
+ @param pristine_commit_name: archive filename to commit to pristine-tar
+ @type pristine_commit_name: C{str} or C{None}
+ @param filters: filter to exclude files
+ @type filters: C{list} of C{str} or C{None}
+ @param prefix: prefix (i.e. leading directory of files) to use in
+ pristine-tar, set to C{None} to not mangle orig archive
+ @type prefix: C{str} or C{None}
+ @param tmpdir: temporary working dir (cleanup left to caller)
+ @type tmpdir: C{str}
+ @return: prepared source archive
+ @rtype: C{UpstreamSource}
+ """
+ need_repack = False
+ if source.is_dir():
+ if prefix is None:
+ prefix = '%s-%s' % (pkg_name, pkg_version)
+ gbp.log.info("Using guessed prefix '%s/' for pristine-tar" % prefix)
+ need_repack = True
+ else:
+ if prefix is not None and prefix == source.prefix:
+ prefix = None
+ comp = parse_archive_filename(pristine_commit_name)[2]
+ if filters or prefix is not None or source.compression != comp:
+ if not source.unpacked:
+ unpack_dir = tempfile.mkdtemp(prefix='pristine_unpack_',
+ dir=tmpdir)
+ source.unpack(unpack_dir)
+ need_repack = True
+ pristine_path = os.path.join(tmpdir, pristine_commit_name)
+ if need_repack:
+ gbp.log.debug("Packing '%s' from '%s' for pristine-tar" %
+ (pristine_path, source.unpacked))
+ pristine = source.pack(pristine_path, filters, prefix)
+ else:
+ # Just create symlink for mangling the pristine tarball name
+ os.symlink(source.path, pristine_path)
+ pristine = source.__class__(pristine_path)
+
+ return pristine
+
+
import gzip
import bz2
import subprocess
-
import gbp.tmpfile as tempfile
from gbp.config import GbpOptionParserRpm
from gbp.rpm.git import GitRepositoryError, RpmGitRepository
-from gbp.git.modifier import GitModifier
+from gbp.git.modifier import GitModifier, GitTz
from gbp.command_wrappers import GitCommand, CommandExecFailed
from gbp.errors import GbpError
import gbp.log
return spec
-def find_upstream_commit(repo, upstreamversion, upstream_tag):
+def find_upstream_commit(repo, spec, upstream_tag):
"""Find commit corresponding upstream version"""
- tag_str_fields = {'upstreamversion': upstreamversion,
+ tag_str_fields = {'upstreamversion': spec.upstreamversion,
'vendor': 'Upstream'}
upstream_commit = repo.find_version(upstream_tag, tag_str_fields)
if not upstream_commit:
- raise GbpError("Couldn't find upstream version %s" % upstreamversion)
+ raise GbpError("Couldn't find upstream version %s" %
+ spec.upstreamversion)
return upstream_commit
else:
spec = parse_spec(options, repo)
pq_branch = pq_branch_name(current, options, spec.version)
- upstream_commit = find_upstream_commit(repo, spec.upstreamversion,
- options.upstream_tag)
+ upstream_commit = find_upstream_commit(repo, spec, options.upstream_tag)
export_treeish = options.export_rev if options.export_rev else pq_branch
+ if not repo.has_treeish(export_treeish):
+ raise GbpError('Invalid treeish object %s' % export_treeish)
update_patch_series(repo, spec, upstream_commit, export_treeish, options)
spec = parse_spec(options, repo)
spec_treeish = None
base = current
- upstream_commit = find_upstream_commit(repo, spec.upstreamversion,
- options.upstream_tag)
+ upstream_commit = find_upstream_commit(repo, spec, options.upstream_tag)
packager = get_packager(spec)
pq_branch = pq_branch_name(base, options, spec.version)
else:
base = current
spec = parse_spec(options, repo)
- upstream_commit = find_upstream_commit(repo, spec.upstreamversion,
- options.upstream_tag)
+ upstream_commit = find_upstream_commit(repo, spec, options.upstream_tag)
switch_to_pq_branch(repo, base, options)
GitCommand("rebase")([upstream_commit])
pq_branch = pq_branch_name(old_packaging, options, spec.version)
raise GbpError(err_msg_base + "pq branch %s already exists" % pq_branch)
# Check that the current branch is based on upstream
- upstream_commit = find_upstream_commit(repo, spec.upstreamversion,
- options.upstream_tag)
+ upstream_commit = find_upstream_commit(repo, spec, options.upstream_tag)
if not is_ancestor(repo, upstream_commit, old_packaging):
raise GbpError(err_msg_base + "%s is not based on upstream version %s" %
(old_packaging, spec.upstreamversion))
# Get fake information for the to-be-created git commit
commit_info = {'author': GitModifier(date=now),
'committer': GitModifier(date=now)}
- tag = packaging_tag_name(repo, spec.version, commit_info, options)
+ tag = packaging_tag_name(repo, spec, commit_info, options)
else:
commit_info = {'author': None, 'committer': None}
tag = repo.describe('HEAD', longfmt=True, always=True)
pkgbase='git-buildpackage'
pkgname=('git-buildpackage-rpm' 'git-buildpackage-common' 'git-buildpackage-doc')
-pkgver=0.6.15
+pkgver=0.6.27
pkgrel=0
pkgdesc="Tools from Debian to integrate the package build system with Git"
arch=(any)
package_git-buildpackage-rpm() {
depends=("git-buildpackage-common=$pkgver-$pkgrel" "rpm")
- provides=("tizen-gbp-rpm=20140605")
+ provides=("tizen-gbp-rpm=20160302")
cd $srcdir/$pkgbase-$pkgver
WITHOUT_NOSETESTS=1 \
python2 setup.py install \
'bin/gbp-pull',
'bin/gbp-clone',
'bin/gbp-create-remote-repo',
- 'bin/git-pbuilder'],
+ 'bin/git-pbuilder',
+ 'bin/git-import-srpm',
+ 'bin/gbp-pq-rpm',
+ 'bin/git-buildpackage-rpm',
+ 'bin/git-import-orig-rpm',
+ 'bin/git-rpm-ch'],
packages = find_packages(exclude=['tests', 'tests.*']),
data_files = [("/etc/git-buildpackage/", ["gbp.conf"]),],
setup_requires=['nose>=0.11.1', 'coverage>=2.85'] if \
projects / tools / git-buildpackage.git / commitdiff