| 1 |
commit: 4903ae2e42f3d3c7de63366466a5969a4ad807fc |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Fri Aug 2 13:10:41 2013 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Fri Aug 2 13:10:41 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=4903ae2e |
| 7 |
|
| 8 |
fix --sync-imports behavior |
| 9 |
|
| 10 |
--- |
| 11 |
roverlay/main.py | 11 ++++++++--- |
| 12 |
roverlay/overlay/pkgdir/packagedir_base.py | 2 +- |
| 13 |
2 files changed, 9 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/roverlay/main.py b/roverlay/main.py |
| 16 |
index b67aa31..4954645 100644 |
| 17 |
--- a/roverlay/main.py |
| 18 |
+++ b/roverlay/main.py |
| 19 |
@@ -291,11 +291,16 @@ def main ( |
| 20 |
immediate_ebuild_writes = OPTION ( 'immediate_ebuild_writes' ), |
| 21 |
) |
| 22 |
|
| 23 |
+ if OPTION ( 'sync_imported' ) is False: |
| 24 |
+ ebuild_import_nosync = True |
| 25 |
+ elif OPTION ( 'sync_imported' ) is True: |
| 26 |
+ ebuild_import_nosync = False |
| 27 |
+ else: |
| 28 |
+ ebuild_import_nosync = conf.get_or_fail ( 'nosync' ) |
| 29 |
+ |
| 30 |
overlay_creator.overlay.import_ebuilds ( |
| 31 |
overwrite = not OPTION ( 'incremental' ), |
| 32 |
- nosync = ( |
| 33 |
- OPTION ( 'sync_imported' ) or conf.get_or_fail ( 'nosync' ) |
| 34 |
- ), |
| 35 |
+ nosync = ebuild_import_nosync, |
| 36 |
) |
| 37 |
|
| 38 |
repo_list.add_packages ( overlay_creator.add_package ) |
| 39 |
|
| 40 |
diff --git a/roverlay/overlay/pkgdir/packagedir_base.py b/roverlay/overlay/pkgdir/packagedir_base.py |
| 41 |
index 44f42e9..36097c6 100644 |
| 42 |
--- a/roverlay/overlay/pkgdir/packagedir_base.py |
| 43 |
+++ b/roverlay/overlay/pkgdir/packagedir_base.py |
| 44 |
@@ -627,7 +627,7 @@ class PackageDirBase ( object ): |
| 45 |
env = fetch_env, |
| 46 |
) |
| 47 |
else: |
| 48 |
- return roverlay.tools.ebuilds.doebuild_fetch ( |
| 49 |
+ return roverlay.tools.ebuild.doebuild_fetch ( |
| 50 |
ebuild_file = efile, |
| 51 |
logger = self.logger, |
| 52 |
env = fetch_env, |
Archives