Signed-off-by: Aaron Chan <aaron.chun.yew.c...@intel.com>
---
config.json | 5 ++---
janitor/clobberdir | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/config.json b/config.json
index ecfca51..c9dc21e 100644
--- a/config.json
+++ b/config.json
@@ -8,15 +8,14 @@
"BUILD_HISTORY_DIRECTPUSH" : ["poky:morty", "poky:pyro", "poky:rocko",
"poky:master"],
"BUILD_HISTORY_FORKPUSH" : {"poky-contrib:ross/mut" : "poky:master",
"poky:master-next" : "poky:master"},
- "REPO_STASH_DIR" : "${BASE_HOMEDIR}/git/mirror",
- "TRASH_DIR" : "${BASE_HOMEDIR}/git/trash",
+ "REPO_STASH_DIR" : "/git/mirror",
+ "TRASH_DIR" : "/git/trash",
"QAMAIL_TO" : "richard.pur...@linuxfoundation.org",
"QAMAIL_TO1" : "yocto@yoctoproject.org",
"QAMAIL_CC1" : "pi...@toganlabs.com, ota...@ossystems.com.br,
yi.z...@windriver.com, tracy.gray...@intel.com, joshua.g.l...@intel.com,
apoorv.san...@intel.com, ee.peng.y...@intel.com, aaron.chun.yew.c...@intel.com,
rebecca.swee.fun.ch...@intel.com, chin.huat....@intel.com",
"WEBPUBLISH_DIR" : "${BASE_SHAREDDIR}/",
"WEBPUBLISH_URL" : "https://autobuilder.yocto.io/";,
-
"defaults" : {
"NEEDREPOS" : ["poky"],
"DISTRO" : "poky",
diff --git a/janitor/clobberdir b/janitor/clobberdir
index 5dab5af..73ec87c 100755
--- a/janitor/clobberdir
+++ b/janitor/clobberdir
@@ -19,7 +19,6 @@ import utils
ourconfig = utils.loadconfig()
-
def mkdir(path):
try:
os.makedirs(path)
@@ -43,7 +42,7 @@ if "TRASH_DIR" not in ourconfig:
print("Please set TRASH_DIR in the configuration file")
sys.exit(1)
-trashdir = ourconfig["TRASH_DIR"]
+trashdir = ourconfig["BASE_HOMEDIR"] + ourconfig["TRASH_DIR"]
for x in [clobberdir]:
if os.path.exists(x):
--
2.7.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
