merge_iter: don't compare generators with < via heapq

[bup.git] / lib / bup / git.py

diff --git a/lib/bup/git.py b/lib/bup/git.py
index ff48da7113ed7e4bd5cd363f3807bd7ffa674e5c..13913a56328a418f551d7c727a22798ac4920793 100644 (file)
--- a/lib/bup/git.py
+++ b/lib/bup/git.py
@@ -19,8 +19,9 @@ from bup.helpers import (Sha1, add_error, chunkyreader, debug1, debug2,
                          mmap_read, mmap_readwrite,
                          parse_num,
                          progress, qprogress, shstr, stat_if_exists,
-                         unlink, username, userfullname,
+                         unlink,
                          utc_offset_str)
+from bup.pwdgrp import username, userfullname
 
 verbose = 0
 ignore_midx = 0