def unpack_tarballs(sourcepackage, source, version, component_tarballs, options):
tmpdir = tempfile.mkdtemp(dir='../')
if not source.is_dir(): # Unpack main tarball
source.unpack(tmpdir, options.filters)
gbp.log.debug("Unpacked '%s' to '%s'" % (source.path, source.unpacked))
if orig_needs_repack(source, options):
gbp.log.debug("Filter pristine-tar: repacking '%s' from '%s'" % (source.path, source.unpacked))
(source, tmpdir) = repack_upstream(source, sourcepackage, version, tmpdir, options.filters)
if not source.is_dir(): # Unpack component tarballs
for (component, tarball) in component_tarballs:
unpack_component_tarball(source.unpacked, component, tarball, options.filters)
return (source, tmpdir)
def overlay_extract_origs(source, tarball_dir, dest_dir, options):
"""Overlay extract orig tarballs to export dir before exporting debian dir from git"""
comp_type = guess_comp_type(options.comp_type,
source,
repo=None,
tarball_dir=tarball_dir)
tarball = os.path.join(tarball_dir,
source.upstream_tarball_name(comp_type))
gbp.log.info("Extracting %s to '%s'" %
(os.path.basename(tarball), dest_dir))
move_old_export(dest_dir)
upstream = DebianUpstreamSource(tarball)
upstream.unpack(dest_dir)
# Check if tarball extracts into a single folder:
if upstream.unpacked != dest_dir:
# If it extracts a single folder, move its contents to dest_dir:
gbp.log.debug("Moving %s to %s" % (upstream.unpacked, dest_dir))
tmpdir = dest_dir + '.new'
os.rename(upstream.unpacked, tmpdir)
os.rmdir(dest_dir)
os.rename(tmpdir, dest_dir)
# Remove debian/ from unpacked upstream tarball in case of non 1.0 format
underlay_debian_dir = os.path.join(dest_dir, 'debian')
format_file = os.path.join('debian', 'source', 'format')
if os.path.exists(underlay_debian_dir) and os.path.exists(format_file):
format = DebianSourceFormat.parse_file(format_file)
if format.version in ['2.0', '3.0']:
gbp.log.info("Removing debian/ from unpacked upstream "
"source at %s" % underlay_debian_dir)
shutil.rmtree(underlay_debian_dir)
# Unpack additional tarballs
for c in options.components:
tarball = os.path.join(
tarball_dir, source.upstream_tarball_name(comp_type, component=c))
gbp.log.info("Unpacking '%s' to '%s'" %
(os.path.basename(tarball), dest_dir))
unpack_component_tarball(dest_dir, c, tarball, [])
def overlay_extract_origs(source, tarball_dir, dest_dir, options):
"""Overlay extract orig tarballs to export dir before exporting debian dir from git"""
comp_type = guess_comp_type(options.comp_type,
source,
repo=None,
tarball_dir=tarball_dir)
tarball = os.path.join(tarball_dir, source.upstream_tarball_name(comp_type))
gbp.log.info("Extracting '%s' to '%s'" % (os.path.basename(tarball), dest_dir))
move_old_export(dest_dir)
upstream = DebianUpstreamSource(tarball)
upstream.unpack(dest_dir)
# Check if tarball extracts into a single folder:
if upstream.unpacked != dest_dir:
# If it extracts a single folder, move its contents to dest_dir:
gbp.log.debug("Moving %s to %s" % (upstream.unpacked, dest_dir))
tmpdir = dest_dir + '.new'
os.rename(upstream.unpacked, tmpdir)
os.rmdir(dest_dir)
os.rename(tmpdir, dest_dir)
# Remove debian/ from unpacked upstream tarball in case of non 1.0 format
underlay_debian_dir = os.path.join(dest_dir, 'debian')
format_file = os.path.join('debian', 'source', 'format')
if os.path.exists(underlay_debian_dir) and os.path.exists(format_file):
format = DebianSourceFormat.parse_file(format_file)
if format.version in ['2.0', '3.0']:
gbp.log.info("Removing debian/ from unpacked upstream "
"source at %s" % underlay_debian_dir)
shutil.rmtree(underlay_debian_dir)
# Unpack additional tarballs
for c in options.components:
tarball = os.path.join(tarball_dir, source.upstream_tarball_name(
comp_type, component=c))
gbp.log.info("Extracting '%s' to '%s/%s'" % (os.path.basename(tarball), dest_dir, c))
unpack_component_tarball(dest_dir, c, tarball, [])
def main(argv):
dirs = dict(top=os.path.abspath(os.curdir))
needs_repo = False
ret = 1
skipped = False
options, pkg, target = parse_all(argv)
if not options:
return ExitCodes.parse_error
try:
try:
repo = DebianGitRepository('.')
# remember if the was repo initially empty
repo.empty = repo.is_empty()
(clean, out) = repo.is_clean()
if not clean and not repo.empty:
raise GbpError(
"Repository has uncommitted changes, commit these first: %s"
% out)
except GitRepositoryError:
# no repo found, create one
needs_repo = True
if options.download:
dscfile = download_source(pkg,
dirs=dirs,
unauth=options.allow_unauthenticated)
else:
dscfile = pkg
dsc = DscFile.parse(dscfile)
if dsc.pkgformat not in ['1.0', '3.0']:
raise GbpError("Importing %s source format not yet supported." %
dsc.pkgformat)
if options.verbose:
print_dsc(dsc)
if needs_repo:
target = target or dsc.pkg
if os.path.exists(target):
raise GbpError(
"Directory '%s' already exists. If you want to import into it, "
"please change into this directory otherwise move it away first."
% target)
gbp.log.info("No git repository found, creating one.")
repo = DebianGitRepository.create(target)
repo.empty = True
os.chdir(repo.path)
repo_setup.set_user_name_and_email(options.repo_user,
options.repo_email, repo)
if repo.bare:
disable_pristine_tar(options, "Bare repository")
# unpack
dirs['tmp'] = os.path.abspath(tempfile.mkdtemp(dir='..'))
source = DebianUpstreamSource(dsc.tgz)
source.unpack(dirs['tmp'], options.filters)
for (component, tarball) in dsc.additional_tarballs.items():
gbp.log.info("Found component tarball '%s'" %
os.path.basename(tarball))
unpack_component_tarball(source.unpacked, component, tarball,
options.filters)
if repo.find_version(options.debian_tag, dsc.version):
gbp.log.warn("Version %s already imported." % dsc.version)
if options.allow_same_version:
gbp.log.info("Moving tag of version '%s' since import forced" %
dsc.version)
move_tag_stamp(repo, options.debian_tag, dsc.version)
else:
raise SkipImport
# import
if dsc.native:
import_native(repo, source, dsc, options)
else:
imported = False
commit = repo.find_version(options.upstream_tag,
dsc.upstream_version)
if not repo.find_version(options.upstream_tag,
dsc.upstream_version):
commit = import_upstream(repo, source, dsc, options)
imported = True
if not repo.has_branch(options.debian_branch):
if options.create_missing_branches:
repo.create_branch(options.debian_branch, commit)
else:
raise GbpError(
"Branch %s does not exist, use --create-missing-branches"
% options.debian_branch)
if dsc.diff or dsc.deb_tgz:
apply_debian_patch(repo, source, dsc, commit, options)
else:
gbp.log.warn("Didn't find a diff to apply.")
if imported and options.pristine_tar:
repo.create_pristine_tar_commits(
commit, dsc.tgz, dsc.additional_tarballs.items())
if repo.get_branch() == options.debian_branch or repo.empty:
# Update HEAD if we modified the checked out branch
repo.force_head(options.debian_branch, hard=True)
ret = 0
except KeyboardInterrupt:
gbp.log.err("Interrupted. Aborting.")
except gbpc.CommandExecFailed:
pass # command itself printed an error
except GitRepositoryError as msg:
gbp.log.err("Git command failed: %s" % msg)
except GbpError as err:
if str(err):
gbp.log.err(err)
except SkipImport:
skipped = True
ret = 0
finally:
os.chdir(dirs['top'])
for d in ['tmp', 'download']:
if d in dirs:
gbpc.RemoveTree(dirs[d])()
if not ret and not skipped:
gbp.log.info("Version '%s' imported under '%s'" %
(dsc.version, repo.path))
return ret
def main(argv):
ret = 0
tmpdir = ''
pristine_orig = None
linked = False
repo = None
(options, args) = parse_args(argv)
if not options:
return ExitCodes.parse_error
try:
try:
repo = ImportOrigDebianGitRepository('.')
except GitRepositoryError:
raise GbpError("%s is not a git repository" % (os.path.abspath('.')))
is_empty = repo.is_empty()
if not repo.has_branch(options.upstream_branch) and not is_empty:
raise GbpError(no_upstream_branch_msg % options.upstream_branch)
(clean, out) = repo.is_clean()
if not clean and not is_empty:
gbp.log.err("Repository has uncommitted changes, commit these first: ")
raise GbpError(out)
# Download the main tarball
if options.download:
source = download_orig(args[0])
else:
source = find_source(options.uscan, args)
if not source:
return ExitCodes.failed
# The main tarball
(sourcepackage, version) = detect_name_and_version(repo, source, options)
# Additionl tarballs we expect to exist
component_tarballs = get_component_tarballs(sourcepackage,
version,
source.path,
options.components)
tag = repo.version_to_tag(options.upstream_tag, version)
if repo.has_tag(tag):
raise GbpError("Upstream tag '%s' already exists" % tag)
if repo.bare:
set_bare_repo_options(options)
if not source.is_dir(): # Unpack main tarball
tmpdir = tempfile.mkdtemp(dir='../')
source.unpack(tmpdir, options.filters)
gbp.log.debug("Unpacked '%s' to '%s'" % (source.path, source.unpacked))
if orig_needs_repack(source, options):
gbp.log.debug("Filter pristine-tar: repacking '%s' from '%s'" % (source.path, source.unpacked))
(source, tmpdir) = repack_source(source, sourcepackage, version, tmpdir, options.filters)
if not source.is_dir(): # Unpack component tarballs
for (component, tarball) in component_tarballs:
unpack_component_tarball(source.unpacked, component, tarball, options.filters)
(pristine_orig, linked) = prepare_pristine_tar(source.path,
sourcepackage,
version)
# Don't mess up our repo with git metadata from an upstream tarball
try:
if os.path.isdir(os.path.join(source.unpacked, '.git/')):
raise GbpError("The orig tarball contains .git metadata - giving up.")
except OSError:
pass
try:
import_branch = options.upstream_branch
filter_msg = ["", " (filtering out %s)"
% options.filters][len(options.filters) > 0]
gbp.log.info("Importing '%s' to branch '%s'%s..." % (source.path,
import_branch,
filter_msg))
gbp.log.info("Source package is %s" % sourcepackage)
gbp.log.info("Upstream version is %s" % version)
msg = upstream_import_commit_msg(options, version)
commit = repo.commit_dir(source.unpacked,
msg=msg,
branch=import_branch,
other_parents=repo.vcs_tag_parent(options.vcs_tag, version),
create_missing_branch=is_empty,
)
if options.pristine_tar:
if pristine_orig:
repo.rrr_branch('pristine-tar')
repo.create_pristinetar_commits(import_branch,
pristine_orig,
component_tarballs)
else:
gbp.log.warn("'%s' not an archive, skipping pristine-tar" % source.path)
repo.create_tag(name=tag,
msg="Upstream version %s" % version,
commit=commit,
sign=options.sign_tags,
keyid=options.keyid)
if is_empty:
repo.create_branch(branch=options.debian_branch, rev=commit)
repo.force_head(options.debian_branch, hard=True)
elif options.merge:
repo.rrr_branch(options.debian_branch)
debian_branch_merge(repo, tag, version, options)
# Update working copy and index if we've possibly updated the
# checked out branch
current_branch = repo.get_branch()
if current_branch in [options.upstream_branch,
repo.pristine_tar_branch]:
repo.force_head(current_branch, hard=True)
except (gbpc.CommandExecFailed, GitRepositoryError) as err:
msg = str(err) or 'Unknown error, please report a bug'
raise GbpError("Import of %s failed: %s" % (source.path, msg))
except GbpError as err:
if str(err):
gbp.log.err(err)
ret = 1
if repo and repo.has_rollbacks() and options.rollback:
gbp.log.err("Error detected, Will roll back changes.")
try:
repo.rollback()
# Make sure the very last line as an error message
gbp.log.err("Rolled back changes after import error.")
except Exception as e:
gbp.log.err("%s" % e)
gbp.log.err("Clean up manually and please report a bug: %s" %
repo.rollback_errors)
if pristine_orig and linked and not options.symlink_orig:
os.unlink(pristine_orig)
if tmpdir:
cleanup_tmp_tree(tmpdir)
if not ret:
gbp.log.info("Successfully imported version %s of %s" % (version, source.path))
return ret
def main(argv):
dirs = dict(top=os.path.abspath(os.curdir))
needs_repo = False
ret = 0
skipped = False
options, pkg, target = parse_all(argv)
if not options:
return ExitCodes.parse_error
try:
try:
repo = DebianGitRepository('.')
is_empty = repo.is_empty()
(clean, out) = repo.is_clean()
if not clean and not is_empty:
gbp.log.err("Repository has uncommitted changes, commit these first: ")
raise GbpError(out)
except GitRepositoryError:
# no repo found, create one
needs_repo = True
is_empty = True
if options.download:
dsc = download_source(pkg,
dirs=dirs,
unauth=options.allow_unauthenticated)
else:
dsc = pkg
src = DscFile.parse(dsc)
if src.pkgformat not in ['1.0', '3.0']:
raise GbpError("Importing %s source format not yet supported." % src.pkgformat)
if options.verbose:
print_dsc(src)
if needs_repo:
target = target or src.pkg
if os.path.exists(target):
raise GbpError("Directory '%s' already exists. If you want to import into it, "
"please change into this directory otherwise move it away first."
% target)
gbp.log.info("No git repository found, creating one.")
repo = DebianGitRepository.create(target)
os.chdir(repo.path)
repo_setup.set_user_name_and_email(options.repo_user, options.repo_email, repo)
if repo.bare:
disable_pristine_tar(options, "Bare repository")
dirs['tmp'] = os.path.abspath(tempfile.mkdtemp(dir='..'))
upstream = DebianUpstreamSource(src.tgz)
upstream.unpack(dirs['tmp'], options.filters)
for (component, tarball) in src.additional_tarballs.items():
gbp.log.info("Found component tarball '%s'" % os.path.basename(tarball))
unpack_component_tarball(upstream.unpacked, component, tarball, options.filters)
format = [(options.upstream_tag, "Upstream"), (options.debian_tag, "Debian")][src.native]
tag = repo.version_to_tag(format[0], src.upstream_version)
msg = "%s version %s" % (format[1], src.upstream_version)
if repo.find_version(options.debian_tag, src.version):
gbp.log.warn("Version %s already imported." % src.version)
if options.allow_same_version:
gbp.log.info("Moving tag of version '%s' since import forced" % src.version)
move_tag_stamp(repo, options.debian_tag, src.version)
else:
raise SkipImport
if not repo.find_version(format[0], src.upstream_version):
gbp.log.info("Tag %s not found, importing %s tarball" % (tag, format[1]))
if is_empty:
branch = None
else:
branch = [options.upstream_branch,
options.debian_branch][src.native]
if not repo.has_branch(branch):
if options.create_missing_branches:
gbp.log.info("Creating missing branch '%s'" % branch)
repo.create_branch(branch)
else:
gbp.log.err(no_upstream_branch_msg % branch +
"\nAlso check the --create-missing-branches option.")
raise GbpError
if src.native:
author = get_author_from_changelog(upstream.unpacked)
committer = get_committer_from_author(author, options)
commit_msg = "Import %s\n%s" % (msg, get_changes(upstream.unpacked,
repo,
is_empty,
options.debian_branch))
else:
author = committer = {}
commit_msg = "Import %s" % msg
commit = repo.commit_dir(upstream.unpacked,
commit_msg,
branch,
author=author,
committer=committer)
if not (src.native and options.skip_debian_tag):
repo.create_tag(name=tag,
msg=msg,
commit=commit,
sign=options.sign_tags,
keyid=options.keyid)
if not src.native:
if is_empty:
repo.create_branch(options.upstream_branch, commit)
if options.pristine_tar:
repo.create_pristinetar_commits(options.upstream_branch,
src.tgz,
src.additional_tarballs.items())
if (not repo.has_branch(options.debian_branch) and
(is_empty or options.create_missing_branches)):
repo.create_branch(options.debian_branch, commit)
if not src.native:
if src.diff or src.deb_tgz:
apply_debian_patch(repo, upstream.unpacked, src, options,
tag, is_empty)
else:
gbp.log.warn("Didn't find a diff to apply.")
if repo.get_branch() == options.debian_branch or is_empty:
# Update HEAD if we modified the checked out branch
repo.force_head(options.debian_branch, hard=True)
except KeyboardInterrupt:
ret = 1
gbp.log.err("Interrupted. Aborting.")
except gbpc.CommandExecFailed:
ret = 1
except GitRepositoryError as msg:
gbp.log.err("Git command failed: %s" % msg)
ret = 1
except GbpError as err:
if str(err):
gbp.log.err(err)
ret = 1
except SkipImport:
skipped = True
finally:
os.chdir(dirs['top'])
for d in ['tmp', 'download']:
if d in dirs:
gbpc.RemoveTree(dirs[d])()
if not ret and not skipped:
gbp.log.info("Version '%s' imported under '%s'" % (src.version, repo.path))
return ret
def main(argv):
dirs = dict(top=os.path.abspath(os.curdir))
needs_repo = False
ret = 1
skipped = False
options, pkg, target = parse_all(argv)
if not options:
return ExitCodes.parse_error
try:
try:
repo = DebianGitRepository('.')
# remember if the was repo initially empty
repo.empty = repo.is_empty()
(clean, out) = repo.is_clean()
if not clean and not repo.empty:
raise GbpError("Repository has uncommitted changes, commit these first: %s" % out)
except GitRepositoryError:
# no repo found, create one
needs_repo = True
if options.download:
dscfile = download_source(pkg,
dirs=dirs,
unauth=options.allow_unauthenticated)
else:
dscfile = pkg
dsc = DscFile.parse(dscfile)
if dsc.pkgformat not in ['1.0', '3.0']:
raise GbpError("Importing %s source format not yet supported." % dsc.pkgformat)
if options.verbose:
print_dsc(dsc)
if needs_repo:
target = target or dsc.pkg
if os.path.exists(target):
raise GbpError("Directory '%s' already exists. If you want to import into it, "
"please change into this directory otherwise move it away first."
% target)
gbp.log.info("No git repository found, creating one.")
repo = DebianGitRepository.create(target)
repo.empty = True
os.chdir(repo.path)
repo_setup.set_user_name_and_email(options.repo_user, options.repo_email, repo)
if repo.bare:
disable_pristine_tar(options, "Bare repository")
# unpack
dirs['tmp'] = os.path.abspath(tempfile.mkdtemp(dir='..'))
source = DebianUpstreamSource(dsc.tgz)
source.unpack(dirs['tmp'], options.filters)
for (component, tarball) in dsc.additional_tarballs.items():
gbp.log.info("Found component tarball '%s'" % os.path.basename(tarball))
unpack_component_tarball(source.unpacked, component, tarball, options.filters)
if repo.find_version(options.debian_tag, dsc.version):
gbp.log.warn("Version %s already imported." % dsc.version)
if options.allow_same_version:
gbp.log.info("Moving tag of version '%s' since import forced" % dsc.version)
move_tag_stamp(repo, options.debian_tag, dsc.version)
else:
raise SkipImport
# import
if dsc.native:
import_native(repo, source, dsc, options)
else:
imported = False
commit = repo.find_version(options.upstream_tag, dsc.upstream_version)
if not repo.find_version(options.upstream_tag, dsc.upstream_version):
commit = import_upstream(repo, source, dsc, options)
imported = True
if not repo.has_branch(options.debian_branch):
if options.create_missing_branches:
repo.create_branch(options.debian_branch, commit)
else:
raise GbpError("Branch %s does not exist, use --create-missing-branches" %
options.debian_branch)
if dsc.diff or dsc.deb_tgz:
apply_debian_patch(repo, source, dsc, commit, options)
else:
gbp.log.warn("Didn't find a diff to apply.")
if imported and options.pristine_tar:
repo.create_pristine_tar_commits(commit,
dsc.tgz,
dsc.additional_tarballs.items())
if repo.get_branch() == options.debian_branch or repo.empty:
# Update HEAD if we modified the checked out branch
repo.force_head(options.debian_branch, hard=True)
ret = 0
except KeyboardInterrupt:
gbp.log.err("Interrupted. Aborting.")
except gbpc.CommandExecFailed:
pass # command itself printed an error
except GitRepositoryError as msg:
gbp.log.err("Git command failed: %s" % msg)
debug_exc(options)
except GbpError as err:
if str(err):
gbp.log.err(err)
debug_exc(options)
except SkipImport:
skipped = True
ret = 0
finally:
os.chdir(dirs['top'])
for d in ['tmp', 'download']:
if d in dirs:
gbpc.RemoveTree(dirs[d])()
if not ret and not skipped:
gbp.log.info("Version '%s' imported under '%s'" % (dsc.version, repo.path))
return ret
def main(argv):
dirs = dict(top=os.path.abspath(os.curdir))
needs_repo = False
ret = 0
skipped = False
options, pkg, target = parse_all(argv)
if not options:
return ExitCodes.parse_error
try:
try:
repo = DebianGitRepository('.')
is_empty = repo.is_empty()
(clean, out) = repo.is_clean()
if not clean and not is_empty:
gbp.log.err(
"Repository has uncommitted changes, commit these first: ")
raise GbpError(out)
except GitRepositoryError:
# no repo found, create one
needs_repo = True
is_empty = True
if options.download:
dsc = download_source(pkg,
dirs=dirs,
unauth=options.allow_unauthenticated)
else:
dsc = pkg
src = DscFile.parse(dsc)
if src.pkgformat not in ['1.0', '3.0']:
raise GbpError("Importing %s source format not yet supported." %
src.pkgformat)
if options.verbose:
print_dsc(src)
if needs_repo:
target = target or src.pkg
if os.path.exists(target):
raise GbpError(
"Directory '%s' already exists. If you want to import into it, "
"please change into this directory otherwise move it away first."
% target)
gbp.log.info("No git repository found, creating one.")
repo = DebianGitRepository.create(target)
os.chdir(repo.path)
repo_setup.set_user_name_and_email(options.repo_user,
options.repo_email, repo)
if repo.bare:
disable_pristine_tar(options, "Bare repository")
dirs['tmp'] = os.path.abspath(tempfile.mkdtemp(dir='..'))
upstream = DebianUpstreamSource(src.tgz)
upstream.unpack(dirs['tmp'], options.filters)
for (component, tarball) in src.additional_tarballs.items():
gbp.log.info("Found component tarball '%s'" %
os.path.basename(tarball))
unpack_component_tarball(upstream.unpacked, component, tarball,
options.filters)
format = [(options.upstream_tag, "Upstream"),
(options.debian_tag, "Debian")][src.native]
tag = repo.version_to_tag(format[0], src.upstream_version)
msg = "%s version %s" % (format[1], src.upstream_version)
if repo.find_version(options.debian_tag, src.version):
gbp.log.warn("Version %s already imported." % src.version)
if options.allow_same_version:
gbp.log.info("Moving tag of version '%s' since import forced" %
src.version)
move_tag_stamp(repo, options.debian_tag, src.version)
else:
raise SkipImport
if not repo.find_version(format[0], src.upstream_version):
gbp.log.info("Tag %s not found, importing %s tarball" %
(tag, format[1]))
if is_empty:
branch = None
else:
branch = [options.upstream_branch,
options.debian_branch][src.native]
if not repo.has_branch(branch):
if options.create_missing_branches:
gbp.log.info("Creating missing branch '%s'" % branch)
repo.create_branch(branch)
else:
gbp.log.err(
no_upstream_branch_msg % branch +
"\nAlso check the --create-missing-branches option."
)
raise GbpError
if src.native:
author = get_author_from_changelog(upstream.unpacked)
committer = get_committer_from_author(author, options)
commit_msg = "Import %s\n%s" % (
msg,
get_changes(upstream.unpacked, repo, is_empty,
options.debian_branch))
else:
author = committer = {}
commit_msg = "Import %s" % msg
commit = repo.commit_dir(upstream.unpacked,
commit_msg,
branch,
author=author,
committer=committer)
if not (src.native and options.skip_debian_tag):
repo.create_tag(name=tag,
msg=msg,
commit=commit,
sign=options.sign_tags,
keyid=options.keyid)
if not src.native:
if is_empty:
repo.create_branch(options.upstream_branch, commit)
if (not repo.has_branch(options.debian_branch)
and (is_empty or options.create_missing_branches)):
repo.create_branch(options.debian_branch, commit)
if not src.native:
if src.diff or src.deb_tgz:
apply_debian_patch(repo, upstream.unpacked, src, options, tag,
is_empty)
else:
gbp.log.warn("Didn't find a diff to apply.")
if repo.get_branch() == options.debian_branch or is_empty:
# Update HEAD if we modified the checked out branch
repo.force_head(options.debian_branch, hard=True)
if options.pristine_tar and not src.native:
repo.create_pristinetar_commits(options.upstream_branch, src.tgz,
src.additional_tarballs.items())
except KeyboardInterrupt:
ret = 1
gbp.log.err("Interrupted. Aborting.")
except gbpc.CommandExecFailed:
ret = 1
except GitRepositoryError as msg:
gbp.log.err("Git command failed: %s" % msg)
ret = 1
except GbpError as err:
if str(err):
gbp.log.err(err)
ret = 1
except SkipImport:
skipped = True
finally:
os.chdir(dirs['top'])
for d in ['tmp', 'download']:
if d in dirs:
gbpc.RemoveTree(dirs[d])()
if not ret and not skipped:
gbp.log.info("Version '%s' imported under '%s'" %
(src.version, repo.path))
return ret
def main(argv):
ret = 0
tmpdir = ''
pristine_orig = None
linked = False
repo = None
(options, args) = parse_args(argv)
if not options:
return ExitCodes.parse_error
try:
try:
repo = ImportOrigDebianGitRepository('.')
except GitRepositoryError:
raise GbpError("%s is not a git repository" %
(os.path.abspath('.')))
is_empty = repo.is_empty()
if not repo.has_branch(options.upstream_branch) and not is_empty:
raise GbpError(no_upstream_branch_msg % options.upstream_branch)
(clean, out) = repo.is_clean()
if not clean and not is_empty:
gbp.log.err(
"Repository has uncommitted changes, commit these first: ")
raise GbpError(out)
# Download the main tarball
if options.download:
source = download_orig(args[0])
else:
source = find_source(options.uscan, args)
if not source:
return ExitCodes.failed
# The main tarball
(sourcepackage,
version) = detect_name_and_version(repo, source, options)
# Additionl tarballs we expect to exist
component_tarballs = get_component_tarballs(sourcepackage, version,
source.path,
options.components)
tag = repo.version_to_tag(options.upstream_tag, version)
if repo.has_tag(tag):
raise GbpError("Upstream tag '%s' already exists" % tag)
if repo.bare:
set_bare_repo_options(options)
if not source.is_dir(): # Unpack main tarball
tmpdir = tempfile.mkdtemp(dir='../')
source.unpack(tmpdir, options.filters)
gbp.log.debug("Unpacked '%s' to '%s'" %
(source.path, source.unpacked))
if orig_needs_repack(source, options):
gbp.log.debug("Filter pristine-tar: repacking '%s' from '%s'" %
(source.path, source.unpacked))
(source, tmpdir) = repack_source(source, sourcepackage, version,
tmpdir, options.filters)
if not source.is_dir(): # Unpack component tarballs
for (component, tarball) in component_tarballs:
unpack_component_tarball(source.unpacked, component, tarball,
options.filters)
(pristine_orig, linked) = prepare_pristine_tar(source.path,
sourcepackage, version)
# Don't mess up our repo with git metadata from an upstream tarball
try:
if os.path.isdir(os.path.join(source.unpacked, '.git/')):
raise GbpError(
"The orig tarball contains .git metadata - giving up.")
except OSError:
pass
try:
import_branch = options.upstream_branch
filter_msg = ["", " (filtering out %s)" % options.filters
][len(options.filters) > 0]
gbp.log.info("Importing '%s' to branch '%s'%s..." %
(source.path, import_branch, filter_msg))
gbp.log.info("Source package is %s" % sourcepackage)
gbp.log.info("Upstream version is %s" % version)
msg = upstream_import_commit_msg(options, version)
commit = repo.commit_dir(
source.unpacked,
msg=msg,
branch=import_branch,
other_parents=repo.vcs_tag_parent(options.vcs_tag, version),
create_missing_branch=is_empty,
)
if options.pristine_tar:
if pristine_orig:
repo.rrr_branch('pristine-tar')
repo.create_pristinetar_commits(import_branch,
pristine_orig,
component_tarballs)
else:
gbp.log.warn("'%s' not an archive, skipping pristine-tar" %
source.path)
repo.create_tag(name=tag,
msg="Upstream version %s" % version,
commit=commit,
sign=options.sign_tags,
keyid=options.keyid)
if is_empty:
repo.create_branch(branch=options.debian_branch, rev=commit)
repo.force_head(options.debian_branch, hard=True)
elif options.merge:
repo.rrr_branch(options.debian_branch)
debian_branch_merge(repo, tag, version, options)
# Update working copy and index if we've possibly updated the
# checked out branch
current_branch = repo.get_branch()
if current_branch in [
options.upstream_branch, repo.pristine_tar_branch
]:
repo.force_head(current_branch, hard=True)
except (gbpc.CommandExecFailed, GitRepositoryError) as err:
msg = str(err) or 'Unknown error, please report a bug'
raise GbpError("Import of %s failed: %s" % (source.path, msg))
except GbpError as err:
if str(err):
gbp.log.err(err)
ret = 1
if repo and repo.has_rollbacks() and options.rollback:
gbp.log.err("Error detected, Will roll back changes.")
try:
repo.rollback()
# Make sure the very last line as an error message
gbp.log.err("Rolled back changes after import error.")
except Exception as e:
gbp.log.err("%s" % e)
gbp.log.err("Clean up manually and please report a bug: %s" %
repo.rollback_errors)
if pristine_orig and linked and not options.symlink_orig:
os.unlink(pristine_orig)
if tmpdir:
cleanup_tmp_tree(tmpdir)
if not ret:
gbp.log.info("Successfully imported version %s of %s" %
(version, source.path))
return ret
