Re: [gentoo-portage-dev] [PATCH] emerge: sync given repos even if auto-sync is false

[Zac Medico]

On 02/20/2017 09:53 AM, Alexandru Elisei wrote:
> ---
> #
> # This will be followed by a series of patches to ignore repos with sync-type
> # unset, as per the man page, fail when sync-uri is not specified and an 
> update
> # to the emerge.1 man page to reflect the change in behavior.
> #
>  pym/_emerge/actions.py  |  8 +--
>  pym/portage/emaint/modules/sync/sync.py | 40 
> -
>  2 files changed, 10 insertions(+), 38 deletions(-)
> 
> diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
> index 71e362e..cc0269d 100644
> --- a/pym/_emerge/actions.py
> +++ b/pym/_emerge/actions.py
> @@ -1999,9 +1999,13 @@ def action_sync(emerge_config, 
> trees=DeprecationWarning,
>   action=action, args=[], trees=trees, opts=opts)
>  
>   syncer = SyncRepos(emerge_config)
> -
>   return_messages = "--quiet" not in emerge_config.opts
> - success, msgs = syncer.auto_sync(options={'return-messages': 
> return_messages})
> + options = {'return-messages' : return_messages}
> + if emerge_config.args:
> + options['repo'] = emerge_config.args
> + success, msgs = syncer.repo(options=options)
> + else:
> + success, msgs = syncer.auto_sync(options=options)
>   if return_messages:
>   print_results(msgs)
>  

The above change works fine by itself, so I've merged it in this commit:

https://gitweb.gentoo.org/proj/portage.git/commit/?id=75f0936b8866b143643abcd6c302cd72fc71eef3

The changes to sync-type and sync-uri validation can go in separately.
-- 
Thanks,
Zac

[gentoo-portage-dev] [PATCH] emerge: sync given repos even if auto-sync is false

[Alexandru Elisei]

---
#
# This will be followed by a series of patches to ignore repos with sync-type
# unset, as per the man page, fail when sync-uri is not specified and an update
# to the emerge.1 man page to reflect the change in behavior.
#
 pym/_emerge/actions.py  |  8 +--
 pym/portage/emaint/modules/sync/sync.py | 40 -
 2 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 71e362e..cc0269d 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1999,9 +1999,13 @@ def action_sync(emerge_config, trees=DeprecationWarning,
action=action, args=[], trees=trees, opts=opts)
 
syncer = SyncRepos(emerge_config)
-
return_messages = "--quiet" not in emerge_config.opts
-   success, msgs = syncer.auto_sync(options={'return-messages': 
return_messages})
+   options = {'return-messages' : return_messages}
+   if emerge_config.args:
+   options['repo'] = emerge_config.args
+   success, msgs = syncer.repo(options=options)
+   else:
+   success, msgs = syncer.auto_sync(options=options)
if return_messages:
print_results(msgs)
 
diff --git a/pym/portage/emaint/modules/sync/sync.py 
b/pym/portage/emaint/modules/sync/sync.py
index 08a92a7..0aeccb3 100644
--- a/pym/portage/emaint/modules/sync/sync.py
+++ b/pym/portage/emaint/modules/sync/sync.py
@@ -148,43 +148,11 @@ class SyncRepos(object):
 
 
def _get_repos(self, auto_sync_only=True):
-   selected_repos = []
-   unknown_repo_names = []
-   missing_sync_type = []
-   if self.emerge_config.args:
-   for repo_name in self.emerge_config.args:
-   #print("_get_repos(): repo_name =", repo_name)
-   try:
-   repo = 
self.emerge_config.target_config.settings.repositories[repo_name]
-   except KeyError:
-   unknown_repo_names.append(repo_name)
-   else:
-   selected_repos.append(repo)
-   if repo.sync_type is None:
-   missing_sync_type.append(repo)
-
-   if unknown_repo_names:
-   writemsg_level("!!! %s\n" % _("Unknown repo(s): 
%s") %
-   " ".join(unknown_repo_names),
-   level=logging.ERROR, noiselevel=-1)
-
-   if missing_sync_type:
-   writemsg_level("!!! %s\n" %
-   _("Missing sync-type for repo(s): %s") %
-   " ".join(repo.name for repo in 
missing_sync_type),
-   level=logging.ERROR, noiselevel=-1)
-
-   if unknown_repo_names or missing_sync_type:
-   writemsg_level("Missing or unknown repos... 
returning",
-   level=logging.INFO, noiselevel=2)
-   return []
-
-   else:
-   
selected_repos.extend(self.emerge_config.target_config.settings.repositories)
-   #print("_get_repos(), selected =", selected_repos)
+   repos = self.emerge_config.target_config.settings.repositories
+   #print("_get_repos(), repos =", repos)
if auto_sync_only:
-   return self._filter_auto(selected_repos)
-   return selected_repos
+   return self._filter_auto(repos)
+   return repos
 
 
def _filter_auto(self, repos):
-- 
2.10.2