grs/Rotator.py: consolidate common rotation code.

1 files changed, 3 insertions, 19 deletions

diff --git a/grs/PivotChroot.py b/grs/PivotChroot.py
index 6eec3a0..8ec0fc6 100644
--- a/grs/PivotChroot.py
+++ b/grs/PivotChroot.py
@@ -9,7 +9,7 @@ from grs.Constants import CONST
 from grs.MountDirectories import MountDirectories
 
 
-class PivotChroot():
+class PivotChroot(Rotator):
     """ doc here
         more doc
     """
@@ -32,25 +32,9 @@ class PivotChroot():
         if some_mounted:
             md.umount_all()
 
-        # TODO: we need to generalize this code into its own class
-        # and inherit it here, in Log.py and Seed.py.
-        # Rotate any previous portage_configroots out of the way
-        dirs = glob.glob('%s.*' % self.portage_configroot)
-        indexed_dir = {}
-        for d in dirs:
-            m = re.search('^.+\.(\d+)$', d)
-            indexed_dir[int(m.group(1))] = d
-        count = list(indexed_dir.keys())
-        count.sort()
-        count.reverse()
-        for c in count:
-            current_dir = indexed_dir[c]
-            m = re.search('^(.+)\.\d+$', current_dir)
-            next_dir = '%s.%d' % (m.group(1), c+1)
-            shutil.move(current_dir, next_dir)
-
-        # Assume portage_configroot exists and out of the way to system.0,
+        # Move portage_configroot out of the way to system.0,
         # then pivot out the inner chroot to system.
+        self.rotate(self.portage_configroot)
         shutil.move(self.portage_configroot, '%s.0' % self.portage_configroot)
         inner_chroot = os.path.join('%s.0' % self.portage_configroot, subchroot)
         shutil.move(inner_chroot, os.path.join(self.tmpdir, 'system'))