diff options
| -rw-r--r-- | lib/git/odb/db.py | 4 | ||||
| -rw-r--r-- | test/git/performance/lib.py | 2 | ||||
| -rw-r--r-- | test/git/test_repo.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/git/odb/db.py b/lib/git/odb/db.py index e656b2b5..c970410d 100644 --- a/lib/git/odb/db.py +++ b/lib/git/odb/db.py @@ -101,7 +101,7 @@ class iObjectDBW(object): # actually use multiple threads, default False of course. If the add shas = list() for args in iter_info: - shas.append(self.to_object(*args, dry_run=dry_run, sha_as_hex=sha_as_hex)) + shas.append(self.to_object(dry_run=dry_run, sha_as_hex=sha_as_hex, *args)) return shas #} END edit interface @@ -155,7 +155,7 @@ class LooseObjectDB(FileDBBase, iObjectDBR, iObjectDBW): # Additional Flags - might be set to 0 after the first failure # Depending on the root, this might work for some mounts, for others not, which # is why it is per instance - self._fd_open_flags = os.O_NOATIME + self._fd_open_flags = getattr(os, 'O_NOATIME', 0) #{ Interface def object_path(self, hexsha): diff --git a/test/git/performance/lib.py b/test/git/performance/lib.py index 650bea82..7d2a9f4a 100644 --- a/test/git/performance/lib.py +++ b/test/git/performance/lib.py @@ -60,6 +60,6 @@ class TestBigRepoRW(TestBigRepoR): @classmethod def tearDownAll(cls): - shutil.rmtree(cls.gitrwrepo.working_tree_dir) + shutil.rmtree(cls.gitrwrepo.working_dir) #} END base classes diff --git a/test/git/test_repo.py b/test/git/test_repo.py index 7dc645b6..d2c7c742 100644 --- a/test/git/test_repo.py +++ b/test/git/test_repo.py @@ -73,7 +73,7 @@ class TestRepo(TestBase): assert_equal("mtrier@gmail.com", c.committer.email) assert_equal(1232829715, c.committed_date) assert_equal(5*3600, c.committer_tz_offset) - assert_equal("Bumped version 0.1.6", c.message) + assert_equal("Bumped version 0.1.6\n", c.message) c = commits[1] assert isinstance(c.parents, tuple) |