From 3824d1196bf39564957fc51f7f4059449154a64a Mon Sep 17 00:00:00 2001 From: crass Date: Wed, 18 Sep 2019 01:26:30 -0500 Subject: [PATCH] Put repositories in backupdir/repositories/${REPO_NAME}/repository in preparation for adding other repository (meta)data. --- github-backup.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/github-backup.py b/github-backup.py index 2c840bc..51ff8a6 100755 --- a/github-backup.py +++ b/github-backup.py @@ -187,9 +187,11 @@ def process_account(gh, account, args): def process_repo(repo, args): LOGGER.info("Processing repo: %s", repo.full_name) - dir = args.backupdir + '/' + args.prefix + repo.name + args.suffix - config = "%s/%s" % (dir, "config" if args.mirror else ".git/config") + dir = os.path.join(args.backupdir, 'repositories', args.prefix + repo.name + args.suffix, 'repository') + config = os.path.join(dir, "config" if args.mirror else ".git/config") + if not os.access(os.path.dirname(dir), os.F_OK): + mkdir_p(os.path.dirname(dir)) if not os.access(config, os.F_OK): LOGGER.info("Repo doesn't exists, lets clone it") clone_repo(repo, dir, args) @@ -216,7 +218,7 @@ def clone_repo(repo, dir, args): if args.mirror: git_args.insert(0, '--mirror') - git("clone", git_args, args.git, args.backupdir) + git("clone", git_args, args.git, os.path.dirname(dir)) def update_repo(repo, dir, args):