This fixes the call to derive_source_from_changelog()
diff --git a/gitubuntu/importlocal.py b/gitubuntu/importlocal.py index 13f8690..bcea6a7 100644 --- a/gitubuntu/importlocal.py +++ b/gitubuntu/importlocal.py @@ -161,7 +161,7 @@ def main( break
dist = derive_source_from_changelog( - Changelog.from_treeish(repo, unapplied_import_tree_hash), + repo.get_changelog_from_treeish(unapplied_import_tree_hash), ) import_dsc( repo=repo,
But 'import-local' still seems broken. It just leaves a tmpdir around that has the stuff i'm looking for, but I would have expected it to puth those refs back into my working .git.
$ git ubuntu import-local my-local-pkg resolvconf_1.69ubuntu1.2.dsc 11/29/2017 13:53:10 - INFO:Using git repository at /tmp/tmpoizoljf3
$ GIT_DIR=/tmp/tmpoizoljf3/.git git branch -l do-not-push my-local-pkg/importer/debian/dsc my-local-pkg/importer/debian/pristine-tar my-local-pkg/importer/ubuntu/dsc my-local-pkg/importer/ubuntu/pristine-tar $ GIT_DIR=/tmp/tmpoizoljf3/.git git tag -l my-local-pkg/applied/1.69ubuntu1.2 my-local-pkg/import/1.69ubuntu1.2
This fixes the call to derive_ source_ from_changelog( )
diff --git a/gitubuntu/ importlocal. py b/gitubuntu/ importlocal. py importlocal. py importlocal. py
index 13f8690..bcea6a7 100644
--- a/gitubuntu/
+++ b/gitubuntu/
@@ -161,7 +161,7 @@ def main(
break
dist = derive_ source_ from_changelog( from_treeish( repo, unapplied_ import_ tree_hash) , changelog_ from_treeish( unapplied_ import_ tree_hash) ,
- Changelog.
+ repo.get_
)
import_dsc(
repo=repo,
But 'import-local' still seems broken. It just leaves a tmpdir
around that has the stuff i'm looking for, but I would have expected
it to puth those refs back into my working .git.
$ git ubuntu import-local my-local-pkg resolvconf_ 1.69ubuntu1. 2.dsc
11/29/2017 13:53:10 - INFO:Using git repository at /tmp/tmpoizoljf3
$ GIT_DIR= /tmp/tmpoizoljf 3/.git git branch -l pkg/importer/ debian/ dsc pkg/importer/ debian/ pristine- tar pkg/importer/ ubuntu/ dsc pkg/importer/ ubuntu/ pristine- tar /tmp/tmpoizoljf 3/.git git tag -l pkg/applied/ 1.69ubuntu1. 2 pkg/import/ 1.69ubuntu1. 2
do-not-push
my-local-
my-local-
my-local-
my-local-
$ GIT_DIR=
my-local-
my-local-