summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarius Makovsky <traveltissues@protonmail.com>2020-04-22 13:41:25 +0100
committerDarius Makovsky <traveltissues@protonmail.com>2020-04-22 15:21:04 +0100
commit70e470f185449360aa2c22ba539032c4fbe94e23 (patch)
treec157eb58350c00acec98e0a43245a520e53af4ce
parent10de4185bf4320b0187f637ec5a84d57882020b1 (diff)
downloadbuildstream-70e470f185449360aa2c22ba539032c4fbe94e23.tar.gz
element.py: resolve invalid defaults for sandbox configtraveltissues/fix1289
closes #1289
-rw-r--r--src/buildstream/element.py2
-rw-r--r--tests/cachekey/project/elements/build1.expected2
-rw-r--r--tests/cachekey/project/elements/compose1.expected2
-rw-r--r--tests/cachekey/project/elements/compose2.expected2
-rw-r--r--tests/cachekey/project/elements/compose3.expected2
-rw-r--r--tests/cachekey/project/elements/compose4.expected2
-rw-r--r--tests/cachekey/project/elements/compose5.expected2
-rw-r--r--tests/cachekey/project/elements/import1.expected2
-rw-r--r--tests/cachekey/project/elements/import2.expected2
-rw-r--r--tests/cachekey/project/elements/import3.expected2
-rw-r--r--tests/cachekey/project/elements/script1.expected2
-rw-r--r--tests/cachekey/project/sources/bzr1.expected2
-rw-r--r--tests/cachekey/project/sources/git1.expected2
-rw-r--r--tests/cachekey/project/sources/git2.expected2
-rw-r--r--tests/cachekey/project/sources/git3.expected2
-rw-r--r--tests/cachekey/project/sources/local1.expected2
-rw-r--r--tests/cachekey/project/sources/local2.expected2
-rw-r--r--tests/cachekey/project/sources/patch1.expected2
-rw-r--r--tests/cachekey/project/sources/patch2.expected2
-rw-r--r--tests/cachekey/project/sources/patch3.expected2
-rw-r--r--tests/cachekey/project/sources/pip1.expected2
-rw-r--r--tests/cachekey/project/sources/remote1.expected2
-rw-r--r--tests/cachekey/project/sources/remote2.expected2
-rw-r--r--tests/cachekey/project/sources/tar1.expected2
-rw-r--r--tests/cachekey/project/sources/tar2.expected2
-rw-r--r--tests/cachekey/project/sources/zip1.expected2
-rw-r--r--tests/cachekey/project/sources/zip2.expected2
-rw-r--r--tests/cachekey/project/target.expected2
28 files changed, 28 insertions, 28 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index 6cce9b93f..7ce645263 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -2706,7 +2706,7 @@ class Element(Plugin):
build_arch = host_arch
return SandboxConfig(
- sandbox_config.get_int("build-uid", None), sandbox_config.get_int("build-gid", None), build_os, build_arch,
+ sandbox_config.get_int("build-uid", 0), sandbox_config.get_int("build-gid", 0), build_os, build_arch,
)
# This makes a special exception for the split rules, which
diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected
index caa45bf73..35d7bd015 100644
--- a/tests/cachekey/project/elements/build1.expected
+++ b/tests/cachekey/project/elements/build1.expected
@@ -1 +1 @@
-648848a7fba41a9da8dec2e0aeb00fc011aec529c791c8c29d9a47fab795e8ef \ No newline at end of file
+85871d035daffddbc38f7138a02cddf5f0189e882c80c85aec92612e0659b397 \ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected
index f914caba8..e48bf5205 100644
--- a/tests/cachekey/project/elements/compose1.expected
+++ b/tests/cachekey/project/elements/compose1.expected
@@ -1 +1 @@
-80f5d8706bb6e1eb794e74a78d0738850dae3155091879525860c979c3cdf696 \ No newline at end of file
+fda994107ef94ec14304255fb378915ffe33bed479bce9701840c783aed1573b \ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected
index 307d33076..d4107cc8c 100644
--- a/tests/cachekey/project/elements/compose2.expected
+++ b/tests/cachekey/project/elements/compose2.expected
@@ -1 +1 @@
-e9c86ffe988cce20c1226a40bed0af44400d3ddc1a5942424aa43202781069b0 \ No newline at end of file
+251e1aa086d81e0c1827c436b5cccb71f1358274acde85e651e22f8a8cc7ad11 \ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected
index d02882afd..da2429f39 100644
--- a/tests/cachekey/project/elements/compose3.expected
+++ b/tests/cachekey/project/elements/compose3.expected
@@ -1 +1 @@
-b79b0265dadbd9a052c677f85615bec95153055eb64091378fff8eb3dc9ecae4 \ No newline at end of file
+995fb6da08687e9d6a2b5fc0fca083009abe2d30549b8fee1bfc2fc2c3cb7da4 \ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected
index 750423f70..2bb156445 100644
--- a/tests/cachekey/project/elements/compose4.expected
+++ b/tests/cachekey/project/elements/compose4.expected
@@ -1 +1 @@
-3cd0532d8160db2918970133dc7d7e4ddf0fd4f5aa03340753d941ab894e2c8f \ No newline at end of file
+7b6b33f9dcf500a5c66dc54330bf4d3095cb11558c1e4613cf925a13e81664de \ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected
index 8aa52e9f5..1df2b713f 100644
--- a/tests/cachekey/project/elements/compose5.expected
+++ b/tests/cachekey/project/elements/compose5.expected
@@ -1 +1 @@
-b545838260f214d6a774cb0757e5fdbf81041924cf0036e335dee6a5a2fb96c4 \ No newline at end of file
+9791ee3fe29c566a8e9fd2ad2dd52eb6132a506beb43ebcf3940c222c7363174 \ No newline at end of file
diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected
index e242882a3..5ab85371a 100644
--- a/tests/cachekey/project/elements/import1.expected
+++ b/tests/cachekey/project/elements/import1.expected
@@ -1 +1 @@
-01814090d495860a7ab39054f57b32197661e4d5ba1b9573c12cc0edeecb75a8 \ No newline at end of file
+8fad683872e71d24c7f08a11fa015b39fd35bf0191fceb4524dd3492a857d96e \ No newline at end of file
diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected
index 802e1347a..282b35784 100644
--- a/tests/cachekey/project/elements/import2.expected
+++ b/tests/cachekey/project/elements/import2.expected
@@ -1 +1 @@
-fc2ce4996757fa4557454a10c1f73e746604fae096c226adf05642559f35763e \ No newline at end of file
+387c49fda4739dd7237fda44591e48c426578e4470556bbbe8dff093acb7e3d0 \ No newline at end of file
diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected
index 438bf9172..a5898c816 100644
--- a/tests/cachekey/project/elements/import3.expected
+++ b/tests/cachekey/project/elements/import3.expected
@@ -1 +1 @@
-a828a8bfb3b036441dcbf635ca4ef6e7f079cb52128cacf4a8d844cb44e3c762 \ No newline at end of file
+e5f290403d81a38aa343ee23a638a2968b138c717f20c9f894b2b5a0eb4feeb6 \ No newline at end of file
diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected
index 6667b5bea..8b1a01f38 100644
--- a/tests/cachekey/project/elements/script1.expected
+++ b/tests/cachekey/project/elements/script1.expected
@@ -1 +1 @@
-472cfe8a41856db06bf1d5c2fa052e8985ce00534df4a98b22378f15b2d9d188 \ No newline at end of file
+2318216a98f8f5b02dadaf8f6fce0c69916c4fa34ca60dd74aa6987fb1898336 \ No newline at end of file
diff --git a/tests/cachekey/project/sources/bzr1.expected b/tests/cachekey/project/sources/bzr1.expected
index 50eff30c6..cd789c2c8 100644
--- a/tests/cachekey/project/sources/bzr1.expected
+++ b/tests/cachekey/project/sources/bzr1.expected
@@ -1 +1 @@
-2825e2d55baa6617ec7e559ae554bb66761105a1ce50028bffdb983b6bb11707 \ No newline at end of file
+3464b4f4bee80b6df82aa2bd841be1a4a5611151ba761c45128766149b61e845 \ No newline at end of file
diff --git a/tests/cachekey/project/sources/git1.expected b/tests/cachekey/project/sources/git1.expected
index 833e3a9a9..9ba44a177 100644
--- a/tests/cachekey/project/sources/git1.expected
+++ b/tests/cachekey/project/sources/git1.expected
@@ -1 +1 @@
-4e21bc1089066998d44933fdf1e48b2a5a73ceaba7a3944538f3f142e34b8b8e \ No newline at end of file
+03c830e63fab7b8ed901e406880cb5c6910c794fe056591f56a5341195f9b9de \ No newline at end of file
diff --git a/tests/cachekey/project/sources/git2.expected b/tests/cachekey/project/sources/git2.expected
index b4d2e70ae..2736c5563 100644
--- a/tests/cachekey/project/sources/git2.expected
+++ b/tests/cachekey/project/sources/git2.expected
@@ -1 +1 @@
-c6cb011849cb0ded98add6f46e6737caa1191e6cec58bcee20f06a5198f03466 \ No newline at end of file
+26b9c50a4303f58269171e03b13f73cf4740b69d1ae71471fa84f4a8739e579d \ No newline at end of file
diff --git a/tests/cachekey/project/sources/git3.expected b/tests/cachekey/project/sources/git3.expected
index 2d12c164d..cdf306f1a 100644
--- a/tests/cachekey/project/sources/git3.expected
+++ b/tests/cachekey/project/sources/git3.expected
@@ -1 +1 @@
-65f9f934ed84d63bb19dab4c323bb3a4a3cef85d9592f5be9d6d6e420952747e \ No newline at end of file
+976290319ea34162e99ca8f82280d70f83085874640f251bd34fc260fb48f4d7 \ No newline at end of file
diff --git a/tests/cachekey/project/sources/local1.expected b/tests/cachekey/project/sources/local1.expected
index e242882a3..5ab85371a 100644
--- a/tests/cachekey/project/sources/local1.expected
+++ b/tests/cachekey/project/sources/local1.expected
@@ -1 +1 @@
-01814090d495860a7ab39054f57b32197661e4d5ba1b9573c12cc0edeecb75a8 \ No newline at end of file
+8fad683872e71d24c7f08a11fa015b39fd35bf0191fceb4524dd3492a857d96e \ No newline at end of file
diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected
index 184ededc7..937afd47c 100644
--- a/tests/cachekey/project/sources/local2.expected
+++ b/tests/cachekey/project/sources/local2.expected
@@ -1 +1 @@
-586f82dd991878c0bd4b373bcd9685505c930cf2477b13557257b962c899ef70 \ No newline at end of file
+5eb075c961057f7e458f85d509f85a43db78356022674970b6624697f7397933 \ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch1.expected b/tests/cachekey/project/sources/patch1.expected
index 873cb1f21..bce445849 100644
--- a/tests/cachekey/project/sources/patch1.expected
+++ b/tests/cachekey/project/sources/patch1.expected
@@ -1 +1 @@
-7bc6295e5f201f2a04ccd7ea8b3be8ef904fa684bfb5d6ec3ec37174bb4a4cf3 \ No newline at end of file
+80e38bf4dbdc0ab76ebf225a0ab176d7c7e6ad45d944576b56fb531835619af6 \ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch2.expected b/tests/cachekey/project/sources/patch2.expected
index a9deef92f..d0ab5733a 100644
--- a/tests/cachekey/project/sources/patch2.expected
+++ b/tests/cachekey/project/sources/patch2.expected
@@ -1 +1 @@
-973765368a6082d2c317da1f1fffbcf1f1ab586548d816a6e7a1f6136f3271aa \ No newline at end of file
+9c40a5760e055da41fd91bde232ba1c608ae47a693c8bca6d46263bd81072fc1 \ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch3.expected b/tests/cachekey/project/sources/patch3.expected
index b04dc3b75..691bc55f6 100644
--- a/tests/cachekey/project/sources/patch3.expected
+++ b/tests/cachekey/project/sources/patch3.expected
@@ -1 +1 @@
-506ccb32c5d9960fa74a3e224c583a399a71198162fb7c5604cb8d4b53af2307 \ No newline at end of file
+bee1c46d8c24f401f63337e188babf54ff054b08aa6884185cb5f5124f0186a6 \ No newline at end of file
diff --git a/tests/cachekey/project/sources/pip1.expected b/tests/cachekey/project/sources/pip1.expected
index 844f4c54c..b2c874ba0 100644
--- a/tests/cachekey/project/sources/pip1.expected
+++ b/tests/cachekey/project/sources/pip1.expected
@@ -1 +1 @@
-70870ffa81e4527a2d812c809b1e99025c72d1ae289be38e45a5b22dc0262eac \ No newline at end of file
+c06a4363468dd70780145d78ed7e33a9513303058e533ce71c225a2990e19b9b \ No newline at end of file
diff --git a/tests/cachekey/project/sources/remote1.expected b/tests/cachekey/project/sources/remote1.expected
index 6f735034a..dd2677265 100644
--- a/tests/cachekey/project/sources/remote1.expected
+++ b/tests/cachekey/project/sources/remote1.expected
@@ -1 +1 @@
-94cac120225f3c023bdf3933b1248dbd1a0cdc401af1d0d76a3f603a1928c863 \ No newline at end of file
+38e4c378614a1ef630711640d3e0d47eae1462905e862b88af087b6e4e385c68 \ No newline at end of file
diff --git a/tests/cachekey/project/sources/remote2.expected b/tests/cachekey/project/sources/remote2.expected
index f575c8db3..def61a462 100644
--- a/tests/cachekey/project/sources/remote2.expected
+++ b/tests/cachekey/project/sources/remote2.expected
@@ -1 +1 @@
-51e296dd94a8e8fd94c85074458597b6ff33679add366a213187bd3904c1018a \ No newline at end of file
+d27bb52e6d54f894d9aba0b5ff71887c2efda73a940872df5518bdb8fb1a8f9d \ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar1.expected b/tests/cachekey/project/sources/tar1.expected
index 6dda711fd..f73b84214 100644
--- a/tests/cachekey/project/sources/tar1.expected
+++ b/tests/cachekey/project/sources/tar1.expected
@@ -1 +1 @@
-a1cb6f9f795c29d8c73239eff44bdabac29ee31c64cb1b6afb599093b9ce8737 \ No newline at end of file
+6d1106b61490ed0dbb6bf321b184db9ae5a7c4120ea28d847ecc04c0a68496fe \ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar2.expected b/tests/cachekey/project/sources/tar2.expected
index 6fb5021d5..899da4fa0 100644
--- a/tests/cachekey/project/sources/tar2.expected
+++ b/tests/cachekey/project/sources/tar2.expected
@@ -1 +1 @@
-86f177f46e35ff192796d4523d1d9537d518dde93f8f2ceba132750f0661706a \ No newline at end of file
+76b770c409d4ddecceead7490f3bd23cc52dddf371b770f8a0c92314a3ffe794 \ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip1.expected b/tests/cachekey/project/sources/zip1.expected
index e34a14eaf..5d0a66154 100644
--- a/tests/cachekey/project/sources/zip1.expected
+++ b/tests/cachekey/project/sources/zip1.expected
@@ -1 +1 @@
-a409fc675bb26b64b1670abbb9faf8baa64ed04ea291fa7424ee549d915f90f0 \ No newline at end of file
+3e4e4f38e150e8ed23e0cc459477fe0a640f944bf3048b32d6360344d5826987 \ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip2.expected b/tests/cachekey/project/sources/zip2.expected
index dce49654a..6c8d9b2c3 100644
--- a/tests/cachekey/project/sources/zip2.expected
+++ b/tests/cachekey/project/sources/zip2.expected
@@ -1 +1 @@
-1f59dfd67201062654ddf17394d026b85de0f7bdaf949f857e324ea202f34b1a \ No newline at end of file
+f2f7eda2fce9b3fa0e8cc6c9384918f53b2c32e267487441056c5588b1b12d73 \ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index cf38ddcfe..621c224dc 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-a57f84353d1528b3ecbd9993ac02a20d0355f2451e19700172c95575af9a5b48 \ No newline at end of file
+ecf89de5ac49e41a0ca4dde2d9aee4686b38baa0c8b38b85d67c539cbe7fd288 \ No newline at end of file