[Yum-devel] [PATCH 1/2] Add each (pkgtup, file) require only once.

[James Antill]

On Thu, 2013-04-04 at 10:22 +0200, Zdenek Pavlas wrote:
> ---
>  yum/depsolve.py | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

 This doesn't seem bad ... but AFAICS the only difference should be if
you have the same txmbr.po.pkgtup within a single run, is that
happening?

> diff --git a/yum/depsolve.py b/yum/depsolve.py
> index 79600e6..3782714 100644
> --- a/yum/depsolve.py
> +++ b/yum/depsolve.py
> @@ -1212,10 +1212,10 @@ class Depsolve(object):
>  
>          # get file requirements from new packages
>          for txmbr in self._tsInfo.getMembersWithState(output_states=TS_INSTALL_STATES):
> +            files = []
>              for name, flag, evr in txmbr.po.requires:
>                  if name.startswith('/'):
> -                    pt = txmbr.po.pkgtup
> -                    self.installedFileRequires.setdefault(pt, []).append(name)
> +                    files.append(name)
>                      # check if file requires was already unresolved in update
>                      if name in self.installedUnresolvedFileRequires:
>                          already_broken = False
> @@ -1229,6 +1229,7 @@ class Depsolve(object):
>                          nfileRequires.add(name)
>                      fileRequires.add(name)
>                      reverselookup.setdefault(name, []).append(txmbr.po.pkgtup)
> +            self.installedFileRequires[txmbr.po.pkgtup] = files
>  
>          todel = []
>          for fname in self.installedFileProviders: