[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/vcs/svn/, repoman/pym/repoman/

[Zac Medico]

commit:     6c1264ea9d10d698f459b3046cc909c8b4f8fe73
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 20:45:53 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 20:52:13 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=6c1264ea

repoman: fix missing vcs_files_to_cps repodir argument (bug 585864)

Update 2 remaining vcs_files_to_cps calls to supply the repodir argument.

Fixes: d715028a6865 ("repoman: handle removed packages in vcs_files_to_cps (bug 
546010)")
X-Gentoo-Bug: 585864
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=585864

 repoman/pym/repoman/actions.py                 | 1 +
 repoman/pym/repoman/modules/vcs/svn/changes.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/repoman/pym/repoman/actions.py b/repoman/pym/repoman/actions.py
index 4144b45..16d602a 100644
--- a/repoman/pym/repoman/actions.py
+++ b/repoman/pym/repoman/actions.py
@@ -504,6 +504,7 @@ class Actions(object):
                try:
                        for x in sorted(vcs_files_to_cps(
                                chain(myupdates, myremoved, mymanifests),
+                               self.scanner.repo_settings.repodir,
                                self.scanner.repolevel, self.scanner.reposplit, 
self.scanner.categories)):
                                self.repoman_settings["O"] = 
os.path.join(self.repo_settings.repodir, x)
                                manifest_path = 
os.path.join(self.repoman_settings["O"], "Manifest")

diff --git a/repoman/pym/repoman/modules/vcs/svn/changes.py 
b/repoman/pym/repoman/modules/vcs/svn/changes.py
index d83c7c4..0bb10d8 100644
--- a/repoman/pym/repoman/modules/vcs/svn/changes.py
+++ b/repoman/pym/repoman/modules/vcs/svn/changes.py
@@ -134,6 +134,7 @@ class Changes(ChangesBase):
                if updates or removed:
                        for x in sorted(vcs_files_to_cps(
                                chain(updates, removed, manifests),
+                               scanner.repo_settings.repodir,
                                scanner.repolevel, scanner.reposplit, 
scanner.categories)):
                                self.repoman_settings["O"] = 
os.path.join(self.repo_settings.repodir, x)
                                digestgen(mysettings=self.repoman_settings, 
myportdb=self.repo_settings.portdb)