chiark / gitweb /
Fix rm safety check
authorCiaran Gultnieks <ciaran@ciarang.com>
Sun, 27 Oct 2013 17:16:04 +0000 (17:16 +0000)
committerCiaran Gultnieks <ciaran@ciarang.com>
Sun, 27 Oct 2013 17:16:04 +0000 (17:16 +0000)
I got it backwards due to my stupid parameter naming.

fdroidserver/common.py

index ce9eb594cd8012b01deeddd32c2a3a2f9aee60ab..6a6ed953e4a1b48d63d449d056cb85afd27a2137 100644 (file)
@@ -1428,8 +1428,9 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
     if 'rm' in build:
         for part in build['rm'].split(';'):
             dest = os.path.join(build_dir, part.strip())
-            if not os.path.realpath(dest).startswith(os.path.realpath(root_dir)):
-                raise BuildException("rm is outside build root")
+            if not os.path.realpath(dest).startswith(os.path.realpath(build_dir)):
+                raise BuildException("rm for {0} is outside build root {1}".format(
+                    os.path.realpath(build_dir),os.path.realpath(dest)))
             if os.path.exists(dest):
                 subprocess.call('rm -rf ' + dest, shell=True)