[gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/pkgdir/distroot/

[André Erdmann]

commit:     771754c749e09f8722324304a9399e67bbf9aafa
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug 30 14:46:41 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug 30 14:46:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=771754c7

distroot: handle_file_collision()

This commit adds initial support for handling file collisions by simply ignoring
subsequent files with the same name (and screaming to stdout).

TODO notes:
* re-use volatile entries when creating manifest files
* (could) resolve file collisions with automatic renaming

---
 roverlay/overlay/pkgdir/distroot/distroot.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/roverlay/overlay/pkgdir/distroot/distroot.py b/roverlay/overlay/pkgdir/distroot/distroot.py
index 6deb06f..96c6894 100644
--- a/roverlay/overlay/pkgdir/distroot/distroot.py
+++ b/roverlay/overlay/pkgdir/distroot/distroot.py
@@ -608,4 +608,25 @@ class PersistentDistroot ( DistrootBase ):
       return tuple ( get_int ( s ) for s in strategy )
    # --- end of _get_int_strategy (...) ---
 
+   def handle_file_collision ( self, package_dir, package_info ):
+      if self.distmap.get_distfile_slot ( package_dir, package_info ):
+         return True
+      else:
+         # TODO/COULDFIX:
+         #  resolve conflict instead of ignoring filtering
+         #
+
+         # *** DEBUG CODE ***
+         vartable = package_info.create_vartable ( package_dir.get_upper().name )
+         print (
+            "dropping {P} from {CATEGORY}/{PN}".format ( **vartable )
+         )
+         self.logger.info (
+            "dropping {!r}: distmap file collision.".format ( package_info )
+         )
+         # *** END DEBUG CODE ***
+
+         return False
+   # --- end of handle_file_collision (...) ---
+
 # --- end of PersistentDistroot ---