Added logic for case when new update files appear in portage

1 files changed, 19 insertions, 7 deletions

diff --git a/utils/grumpy_sync.py b/utils/grumpy_sync.py
index 3a4da26..268778a 100755
--- a/utils/grumpy_sync.py
+++ b/utils/grumpy_sync.py
@@ -58,13 +58,25 @@ def main(path, initial_sync):
                     if line[0] == 'move' and \
                             line[1] not in update_data['moves'].keys():
                         pkg_moves[line[1]] = line[2]
-                # Do it after sync has completed successfully...
-                #x['moves'] = copy(moves)
-                #x['mtime'] = mtime
+        # New updates file has been added
         else:
-            # New file has appeared..
-            print "New file(s) in the list!"
-            raise NotImplementedError
+            # First, get the rules from previous update file...
+            # FIXME: Should we check whether file exists?
+            # ...but these files should never disappear...
+            for line in iter_read_bash( \
+                                os.path.join(movedir, update_data['file'])):
+                line = line.split()
+                if line[0] == 'move' and \
+                        line[1] not in update_data['moves'].keys():
+                    pkg_moves[line[1]] = line[2]
+            # Now read moves from newer files
+            # FIXME: What about duplicate keys?
+            # ...common sense says it should not happen...
+            for file in move_files[move_files.index(update_data['file']):]:
+                for line in iter_read_bash(os.path.join(movedir, file)):
+                    line = line.split()
+                    if line[0] == 'move':
+                        pkg_moves[line[1]] = line[2]
 
     def extract_version(pkg, cpv):
         """..."""
@@ -215,7 +227,7 @@ def main(path, initial_sync):
                 print "DEBUG: package has been moved:", pkg
                 raise NotImplementedError
             else:
-                print "DEBUG: package has been (re)moved:", pkg
+                print "DEBUG: package has been removed:", pkg
                 package = Package.query.filter_by(cat=cat).filter_by(pkg=pkg).one()
                 session.delete(package)
                 session.commit()