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

[André Erdmann]

commit:     441fcf253606e593a7e3b253278a75cfd1ae9d1c
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Sep  2 08:43:24 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Sep  2 08:43:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=441fcf25

distroot, file collisions: rename distfiles

---
 roverlay/overlay/pkgdir/distroot/distroot.py | 31 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/roverlay/overlay/pkgdir/distroot/distroot.py b/roverlay/overlay/pkgdir/distroot/distroot.py
index 2ec43ec..c866bea 100644
--- a/roverlay/overlay/pkgdir/distroot/distroot.py
+++ b/roverlay/overlay/pkgdir/distroot/distroot.py
@@ -612,22 +612,23 @@ class PersistentDistroot ( DistrootBase ):
       if self.distmap.get_distfile_slot ( package_dir, package_info ):
          return True
       else:
-         # TODO/COULDFIX:
-         #  resolve conflict instead of simply ignoring files
-         #  (-> e.g. rename files)
-         #
+         distfile      = package_info.get_src_uri_dest().rpartition ( os.sep )
+         rename_prefix = package_info ['repo_name'].lower() + '_'
 
-         # *** 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
+         if distfile[2][:len(rename_prefix)] == rename_prefix:
+            # already prefixed with the repo name
+            return False
+         else:
+            package_info.update (
+               src_uri_dest=(
+                  distfile[0] + distfile[1] + rename_prefix + distfile[2]
+               )
+            )
+            #return self.distmap.get_distfile_slot(...)
+            if self.distmap.get_distfile_slot ( package_dir, package_info ):
+               return True
+            else:
+               return False
    # --- end of handle_file_collision (...) ---
 
 # --- end of PersistentDistroot ---