From c4371b9cc34a40155d46e7bef348b0a2c5a1b3b3 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 23 Jan 2011 16:24:50 +0000 Subject: Fix path tuples when there are more than max subdirs at root. --- genbackupdatalib/names.py | 3 ++- genbackupdatalib/names_tests.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/genbackupdatalib/names.py b/genbackupdatalib/names.py index f6ba4e1..287112d 100644 --- a/genbackupdatalib/names.py +++ b/genbackupdatalib/names.py @@ -56,9 +56,10 @@ class NameGenerator(object): return (n,) else: items = [] - for i in range(self.depth + 1): # +1 for filenames + for i in range(self.depth): items.append(n % self.max) n /= self.max + items.append(n) items.reverse() return tuple(items) diff --git a/genbackupdatalib/names_tests.py b/genbackupdatalib/names_tests.py index 2f3483f..60b4d79 100644 --- a/genbackupdatalib/names_tests.py +++ b/genbackupdatalib/names_tests.py @@ -75,6 +75,8 @@ class NameGeneratorTests(unittest.TestCase): self.assertEqual(self.names._path_tuple(5), (0, 1, 2)) self.assertEqual(self.names._path_tuple(6), (0, 2, 0)) self.assertEqual(self.names._path_tuple(9), (1, 0, 0)) + self.assertEqual(self.names._path_tuple(18), (2, 0, 0)) + self.assertEqual(self.names._path_tuple(27), (3, 0, 0)) def test_returns_1tuple_for_depth_zero(self): names = genbackupdatalib.NameGenerator(self.tempdir, 0, 1) -- cgit v1.2.1