Add Session.exists / Session.scandir.

ognibuild/buildsystem.py

@@ -19,7 +19,6 @@
 
 import logging
 import re
-import os
 
 from . import shebang_binary
 from .apt import AptManager, UnidentifiedError
@@ -200,7 +199,8 @@ class Gem(BuildSystem):
 
     def dist(self):
         self.setup()
-        gemfiles = [name for name in os.listdir('.') if name.endswith('.gem')]
+        gemfiles = [entry.name for entry in self.session.scandir('.')
+                    if entry.name.endswith('.gem')]
         if len(gemfiles) > 1:
             logging.warning('More than one gemfile. Trying the first?')
         run_with_build_fixer(self.session, ['gem2tgz', gemfiles[0]])
@@ -244,12 +244,12 @@ class Make(BuildSystem):
 
     def setup(self):
         apt = AptManager(self.session)
-        if os.path.exists('Makefile.PL') and not os.path.exists('Makefile'):
+        if self.session.exists('Makefile.PL') and not self.session.exists('Makefile'):
             apt.install(['perl'])
             run_with_build_fixer(self.session, ['perl', 'Makefile.PL'])
 
-        if not os.path.exists('Makefile') and not os.path.exists('configure'):
+        if not self.session.exists('Makefile') and not self.session.exists('configure'):
-            if os.path.exists('autogen.sh'):
+            if self.session.exists('autogen.sh'):
                 if shebang_binary('autogen.sh') is None:
                     run_with_build_fixer(
                         self.session, ['/bin/sh', './autogen.sh'])
@@ -264,14 +264,14 @@ class Make(BuildSystem):
                     else:
                         raise
 
-            elif (os.path.exists('configure.ac') or
+            elif (self.session.exists('configure.ac') or
-                    os.path.exists('configure.in')):
+                    self.session.exists('configure.in')):
                 apt.install([
                     'autoconf', 'automake', 'gettext', 'libtool',
                     'gnu-standards'])
                 run_with_build_fixer(self.session, ['autoreconf', '-i'])
 
-        if not os.path.exists('Makefile') and os.path.exists('configure'):
+        if not self.session.exists('Makefile') and self.session.exists('configure'):
             self.session.check_call(['./configure'])
 
     def dist(self):
@@ -319,38 +319,40 @@ class Make(BuildSystem):
 
 def detect_buildsystems(session):
     """Detect build systems."""
-    if os.path.exists('package.xml'):
+    if session.exists('package.xml'):
         logging.info('Found package.xml, assuming pear package.')
         yield Pear(session)
 
-    if os.path.exists('setup.py'):
+    if session.exists('setup.py'):
         logging.info('Found setup.py, assuming python project.')
         yield SetupPy(session)
 
-    if os.path.exists('pyproject.toml'):
+    if session.exists('pyproject.toml'):
         logging.info('Found pyproject.toml, assuming python project.')
         yield PyProject(session)
 
-    if os.path.exists('setup.cfg'):
+    if session.exists('setup.cfg'):
         logging.info('Found setup.cfg, assuming python project.')
         yield SetupCfg(session)
 
-    if os.path.exists('package.json'):
+    if session.exists('package.json'):
         logging.info('Found package.json, assuming node package.')
         yield NpmPackage(session)
 
-    if os.path.exists('waf'):
+    if session.exists('waf'):
         logging.info('Found waf, assuming waf package.')
         yield Waf(session)
 
-    gemfiles = [name for name in os.listdir('.') if name.endswith('.gem')]
+    gemfiles = [
+        entry.name for entry in session.scandir('.')
+        if entry.name.endswith('.gem')]
     if gemfiles:
         yield Gem(session)
 
-    if os.path.exists('dist.ini') and not os.path.exists('Makefile.PL'):
+    if session.exists('dist.ini') and not session.exists('Makefile.PL'):
         yield DistInkt(session)
 
-    if any([os.path.exists(p) for p in [
+    if any([session.exists(p) for p in [
             'Makefile', 'Makefile.PL', 'autogen.sh', 'configure.ac',
             'configure.in']]):
         yield Make(session)

ognibuild/session/__init__.py

@@ -63,6 +63,13 @@ class Session(object):
         """Create the user's home directory."""
         raise NotImplementedError(self.create_home)
 
+    def exists(self, path: str) -> bool:
+        """Check whether a path exists in the chroot."""
+        raise NotImplementedError(self.exists)
+
+    def scandir(self, path: str):
+        raise NotImplementedError(self.scandir)
+
 
 class SessionSetupFailure(Exception):
     """Session failed to be set up."""

ognibuild/session/plain.py

@@ -18,6 +18,7 @@
 
 from . import Session
 
+import os
 import subprocess
 
 
@@ -35,3 +36,9 @@ class PlainSession(Session):
     def Popen(self, args, stdout=None, stderr=None, user=None, cwd=None):
         return subprocess.Popen(
             args, stdout=stdout, stderr=stderr, cwd=cwd)
+
+    def exists(self, path):
+        return os.path.exists(path)
+
+    def scandir(self, path):
+        return os.scandir(path)

ognibuild/session/schroot.py

@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import logging
+import os
 import shlex
 import subprocess
 
@@ -127,3 +128,16 @@ class SchrootSession(Session):
         logging.info('Creating directory %s', home)
         self.check_call(['mkdir', '-p', home], cwd='/', user='root')
         self.check_call(['chown', user, home], cwd='/', user='root')
+
+    def _fullpath(self, path: str) -> str:
+        return os.path.join(
+            self.location,
+            os.path.join(self._cwd, path).lstrip('/'))
+
+    def exists(self, path: str) -> bool:
+        fullpath = self._fullpath(path)
+        return os.path.exists(fullpath)
+
+    def scandir(self, path: str):
+        fullpath = self._fullpath(path)
+        return os.scandir(fullpath)