Ubuntu Pastebin

Paste from paelzer at Thu, 10 Nov 2016 08:34:47 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
$ usd merge tag ubuntu/devel
Traceback (most recent call last):
  File "/home/paelzer/work/bugs-and-merges/usd-importer/bin/usd", line 15, in <module>
    main()
  File "/home/paelzer/work/bugs-and-merges/usd-importer/usd/__main__.py", line 50, in main
    args.func()
  File "/home/paelzer/work/bugs-and-merges/usd-importer/usd/merge.py", line 188, in main
    ref = local_repo.get(self.onto)
NameError: name 'local_repo' is not defined

ok, then
--- a/usd/merge.py
+++ b/usd/merge.py
@@ -185,7 +185,7 @@ class USDMerge:
         self.onto = args.onto
         self.force = args.force
 
-        ref = local_repo.get(self.onto)
+        ref = self.local_repo.get(self.onto)
         if ref is None:
             logging.info('%s is not a defined object in this '
                          'git repository.' %

$ usd merge tag ubuntu/devel
Traceback (most recent call last):
  File "/home/paelzer/work/bugs-and-merges/usd-importer/bin/usd", line 15, in <module>
    main()
  File "/home/paelzer/work/bugs-and-merges/usd-importer/usd/__main__.py", line 50, in main
    args.func()
  File "/home/paelzer/work/bugs-and-merges/usd-importer/usd/merge.py", line 188, in main
    ref = self.local_repo.get(self.onto)
AttributeError: 'USDGitRepository' object has no attribute 'get'

=> going back to my old checkout for now
Download as text