Comment 1 for bug 1735228

Revision history for this message
Scott Moser (smoser) wrote : Re: 'str' object has no attribute 'peel' in resolvconf

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