Pārlūkot izejas kodu

Merge pull request #2478 from PlasmaPower/faked-debugging

Start fakeroot faked in debug mode - fixes EISDIR issues
enkore 8 gadi atpakaļ
vecāks
revīzija
2fdb6e1faa
3 mainītis faili ar 8 papildinājumiem un 2 dzēšanām
  1. 1 1
      .travis/run.sh
  2. 1 1
      Vagrantfile
  3. 6 0
      scripts/faked-debug.sh

+ 1 - 1
.travis/run.sh

@@ -19,5 +19,5 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
     # no fakeroot on OS X
     # no fakeroot on OS X
     sudo tox -e $TOXENV -r
     sudo tox -e $TOXENV -r
 else
 else
-    fakeroot -u tox -r
+    fakeroot -f scripts/faked-debug.sh -u tox -r
 fi
 fi

+ 1 - 1
Vagrantfile

@@ -318,7 +318,7 @@ def run_tests(boxname)
     # otherwise: just use the system python
     # otherwise: just use the system python
     if which fakeroot 2> /dev/null; then
     if which fakeroot 2> /dev/null; then
       echo "Running tox WITH fakeroot -u"
       echo "Running tox WITH fakeroot -u"
-      fakeroot -u tox --skip-missing-interpreters
+      fakeroot -f scripts/faked-debug.sh -u tox --skip-missing-interpreters
     else
     else
       echo "Running tox WITHOUT fakeroot -u"
       echo "Running tox WITHOUT fakeroot -u"
       tox --skip-missing-interpreters
       tox --skip-missing-interpreters

+ 6 - 0
scripts/faked-debug.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+if which faked; then
+  faked --debug "$@"
+else
+  faked-sysv --debug "$@"
+fi