Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuporter
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4925b1d4b9f2
Choose a base ref
...
head repository: haikuports/haikuporter
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2f5df64165d9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jul 20, 2021

  1. Policy: improve needed library check. 

    * Also checks for versioned libraries, as these satisfy the
  binary requirements.
* Fixes policy warnings for packages that don't provided
  non-versioned shared libraries (e.g. krb5)
    @jessicah @pulkomandy
    jessicah authored and pulkomandy committed Jul 20, 2021
    Copy the full SHA
    2f5df64 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 HaikuPorter/Policy.py
7 changes: 7 additions & 0 deletions HaikuPorter/Policy.py
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@
from subprocess import check_output
import os
import re
import glob

allowedWritableTopLevelDirectories = [
'cache',
@@ -225,16 +226,22 @@ def _isMissingLibraryDependency(self, library, dirPath, rpath):
'lib' + self.secondaryArchSubDir + '/' + library)
if os.path.exists(libDir):
return False
if len(glob.glob(libDir + '*')) == 1:
return False

# the library might be provided by the package (%A/lib)
libDir = os.path.join(dirPath, 'lib/' + library)
if os.path.exists(libDir):
return False
if len(glob.glob(libDir + '*')) == 1:
return False

# the library might be provided by the package, same dir (%A)
libDir = os.path.join(dirPath, library)
if os.path.exists(libDir):
return False
if len(glob.glob(libDir + '*')) == 1:
return False

# the library might be provided by the package in rpath
if rpath is not None: