On Tue, 2018-06-26 at 15:05 +0800, Aaron Chan wrote: > Signed-off-by: Aaron Chan <[email protected]> > --- > 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" : "[email protected]", > "QAMAIL_TO1" : "[email protected]", > "QAMAIL_CC1" : "[email protected], [email protected], yi > [email protected], [email protected], [email protected] > , [email protected], [email protected], aaron.chun.yew.cha > [email protected], [email protected], [email protected] > m", > "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"]
You are correct there is a bug here but reverting my change to config.json is not the way to fix this. Have a look at this commit: http://git.yoctoproject.org/cgit/cgit.cgi/yocto-autobuilder-helper/commit/?id=d6253df2bc21752bc0b53202e491140b0994ff63 and then see if you can send me the patch which fixes this in line with the commit above. Cheers, Richard -- _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
