aboutsummaryrefslogtreecommitdiffhomepage
path: root/git-import-orig
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2008-09-22 19:06:36 +0200
committerGuido Guenther <agx@sigxcpu.org>2008-09-22 19:06:36 +0200
commit624bdc9090c7402963744684a7d6c0ac0af14927 (patch)
tree497505be411ce9eeefa856b965a729ed4764ce31 /git-import-orig
parent3931f708113532788572e0b2590426e31a3b948c (diff)
move replace_source_tree into GitRepository
Diffstat (limited to 'git-import-orig')
-rwxr-xr-xgit-import-orig4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-import-orig b/git-import-orig
index 54a81f52..bf5a2b0e 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -26,7 +26,7 @@ import glob
import subprocess
import gbp.command_wrappers as gbpc
from gbp.deb_utils import parse_changelog, unpack_orig, NoChangelogError, has_epoch, tar_toplevel
-from gbp.git_utils import (GitRepositoryError, GitRepository, build_tag, replace_source_tree)
+from gbp.git_utils import (GitRepositoryError, GitRepository, build_tag)
from gbp.config import GbpOptionParser
from gbp.errors import GbpError
@@ -62,7 +62,7 @@ def symlink_orig(archive, pkg, version):
def import_upstream_tree(repo, src_dir, version, filters, verbose):
"""import the source uptream tree to the current branch"""
try:
- if replace_source_tree(repo, src_dir, filters, verbose=True):
+ if repo.replace_tree(src_dir, filters, verbose=True):
gbpc.GitCommitAll(verbose=verbose)(msg="Imported Upstream version %s" % version)
else:
raise GbpError, "Nothing to commit, nothing imported."