Find files wil now replace system paths with rpm macros (fix #351)

[onionka]

No description provided.

[onionka]

Could you restart Travis? This error shown up:

11.08s$ docker exec -i test_fedora bash -c "dnf builddep -y hawkey"
enabling fedora-source repository
enabling updates-source repository
Last metadata expiration check performed 0:00:01 ago on Thu Nov  5 20:06:32 2015.
Traceback (most recent call last):
  File "/usr/bin/dnf", line 36, in <module>
    main.user_main(sys.argv[1:], exit_code=True)
  File "/usr/lib/python2.7/site-packages/dnf/cli/main.py", line 198, in user_main
    errcode = main(args)
  File "/usr/lib/python2.7/site-packages/dnf/cli/main.py", line 84, in main
    return _main(base, args)
  File "/usr/lib/python2.7/site-packages/dnf/cli/main.py", line 136, in _main
    cli.run()
  File "/usr/lib/python2.7/site-packages/dnf/cli/cli.py", line 1091, in run
    return self.command.run(self.base.extcmds)
  File "/usr/lib/python2.7/site-packages/dnf-plugins/builddep.py", line 76, in inner
    return func(*args, **kwds)
  File "/usr/lib/python2.7/site-packages/dnf-plugins/builddep.py", line 142, in run
    self._remote_deps(pkgspec)
  File "/usr/lib/python2.7/site-packages/dnf-plugins/builddep.py", line 213, in _remote_deps
    package).get_best_query(self.base.sack)})
  File "/usr/lib/python2.7/site-packages/dnf-plugins/builddep.py", line 212, in <setcomp>
    for pkg in dnf.subject.Subject(
  File "/usr/lib/python2.7/site-packages/dnfpluginscore/lib.py", line 170, in package_source_name
    srcname = package.sourcerpm.rstrip(".src.rpm")
AttributeError: 'NoneType' object has no attribute 'rstrip'

[jsilhan]

The travis will be when new dnf-plugins-core package is in the repositories. (the bug is fixed in the upstream but no new version has been released)

[jsilhan]

this should be tuples (prefixes, macros)

[jsilhan]

@lkardos, can you answer, please, if these tuples are accessible from rpm?

[lkardos]

You can use rpm.expandMacro() but there is no easy way how to get names of all defined macros. Probably you have to hardcode them. So you can use something like this:

MACROS = { rpm.expandMacro(x): x for x in ["%{_javadocdir}", "%{_javadocdir}", "%{_javadir}", ... ] }

One way how to avoid harcoded names of macros is to parse them from string returned by rpm.expandMacro("%dump") but I don't recommend that.

[onionka]

ok I have done it with %dump ... there is a problem only with duplicities like this:

-  ('%{_kde4_libdir}/libl.so', None, None),
?      -----

+  ('%{_libdir}/libl.so', None, None),

where %{_kde4_libdir} == '/usr/lib64'
and %{_libdir} == '/usr/lib64'

should I just ignore it?

[onionka]

Now this should be all OK and non-hardcoded

[onionka]

this error is issued #373 but everything else is OK. please restart travis

[onionka]

depends on #358 heavily but all done - I hope tests will pass now

[onionka]

It is failing because of missing macro definition

see #374