| 1 |
commit: 11ffb9e49d0483b5486a878110741f28af465885 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Fri Aug 30 15:42:11 2013 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Fri Aug 30 15:42:11 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=11ffb9e4 |
| 7 |
|
| 8 |
roverlay/overlay: add/remove todo notes |
| 9 |
|
| 10 |
--- |
| 11 |
roverlay/overlay/pkgdir/distroot/distroot.py | 3 ++- |
| 12 |
roverlay/overlay/pkgdir/packagedir_base.py | 8 -------- |
| 13 |
2 files changed, 2 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/roverlay/overlay/pkgdir/distroot/distroot.py b/roverlay/overlay/pkgdir/distroot/distroot.py |
| 16 |
index 96c6894..2ec43ec 100644 |
| 17 |
--- a/roverlay/overlay/pkgdir/distroot/distroot.py |
| 18 |
+++ b/roverlay/overlay/pkgdir/distroot/distroot.py |
| 19 |
@@ -613,7 +613,8 @@ class PersistentDistroot ( DistrootBase ): |
| 20 |
return True |
| 21 |
else: |
| 22 |
# TODO/COULDFIX: |
| 23 |
- # resolve conflict instead of ignoring filtering |
| 24 |
+ # resolve conflict instead of simply ignoring files |
| 25 |
+ # (-> e.g. rename files) |
| 26 |
# |
| 27 |
|
| 28 |
# *** DEBUG CODE *** |
| 29 |
|
| 30 |
diff --git a/roverlay/overlay/pkgdir/packagedir_base.py b/roverlay/overlay/pkgdir/packagedir_base.py |
| 31 |
index 2b669bc..858a475 100644 |
| 32 |
--- a/roverlay/overlay/pkgdir/packagedir_base.py |
| 33 |
+++ b/roverlay/overlay/pkgdir/packagedir_base.py |
| 34 |
@@ -237,14 +237,6 @@ class PackageDirBase ( roverlay.overlay.base.OverlayObject ): |
| 35 |
) |
| 36 |
|
| 37 |
else: |
| 38 |
- # TODO: get a distmap "slot" |
| 39 |
- # else collision can occur when using >1 category, |
| 40 |
- # e.g. per-repo categories |
| 41 |
- # |
| 42 |
- # solutions: |
| 43 |
- # (a) automatic renaming (preferably before revbumping) |
| 44 |
- # (b) ignore packages |
| 45 |
- # |
| 46 |
self.logger.debug ( |
| 47 |
"'{PN}-{PVR}.ebuild' exists as file, skipping.".format ( |
| 48 |
PN=self.name, PVR=shortver |
Archives