opendev/pypi-mirror
Code Issues Proposed changes

Refactor calls to Git

Browse Source 
All pip/virtialenv calls can be refactored in the very same way.

Change-Id: I948546d12ccca0298af012c2d3dac39481049c88
This commit is contained in:
Yuriy Taraday 2014-02-24 21:20:39 +04:00
parent 4a87b5b172
commit 57992fc80f
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pypi_mirror/cmd/run_mirror.py
View File

@ -52,6 +52,7 @@ from __future__ import print_function
import argparse import argparse
import datetime import datetime
import functools
import md5 import md5
import os import os
import pkginfo import pkginfo
@ -97,15 +98,23 @@ class Mirror(object):
self.args = parser.parse_args() self.args = parser.parse_args()
self.config = yaml.load(open(self.args.config)) self.config = yaml.load(open(self.args.config))
def run_command(self, cmd): def run_command(self, *cmd_strs, **kwargs):
cmd_list = shlex.split(str(cmd)) env = kwargs.pop('env', None)
self.debug("Run: %s" % cmd) if kwargs:
badargs = ','.join(kwargs.keys())
raise TypeError(
"run_command() got unexpected keyword arguments %s" % badargs)
cmd_list = []
for cmd_str in cmd_strs:
cmd_list.extend(shlex.split(str(cmd_str)))
self.debug("Run: %s" % " ".join(cmd_strs))
if self.args.noop: if self.args.noop:
return '' return ''
if self.args.no_pip and cmd_list[0].endswith('pip'): if self.args.no_pip and cmd_list[0].endswith('pip'):
return '' return ''
p = subprocess.Popen(cmd_list, stdout=subprocess.PIPE, p = subprocess.Popen(cmd_list, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT, env=env)
(out, nothing) = p.communicate() (out, nothing) = p.communicate()
out = out.strip() out = out.strip()
self.debug(out) self.debug(out)
@ -219,17 +228,20 @@ class Mirror(object):
short_project = project.split('/')[-1] short_project = project.split('/')[-1]
if short_project.endswith('.git'): if short_project.endswith('.git'):
short_project = short_project[:-4] short_project = short_project[:-4]
if not os.path.isdir(short_project): git_work_tree = os.path.join(project_cache_dir, short_project)
self.run_command( if not os.path.isdir(git_work_tree):
"git clone %s %s" % (project, short_project)) self.run_command("git clone %s %s" % (project, git_work_tree))
self.chdir(os.path.join(project_cache_dir, self.chdir(git_work_tree)
short_project)) git = functools.partial(self.run_command, "git", env={
self.run_command("git fetch -p origin") "GIT_WORK_TREE": git_work_tree,
"GIT_DIR": os.path.join(git_work_tree, ".git"),
})
git("fetch -p origin")
if self.args.branch: if self.args.branch:
branches = [self.args.branch] branches = [self.args.branch]
else: else:
branches = self.run_command("git branch -a").split("\n") branches = git("branch -a").split("\n")
for branch in branches: for branch in branches:
branch = branch.strip() branch = branch.strip()
if (not branch.startswith("remotes/origin") if (not branch.startswith("remotes/origin")
@ -237,8 +249,8 @@ class Mirror(object):
continue continue
print("Fetching pip requires for %s:%s" % (project, branch)) print("Fetching pip requires for %s:%s" % (project, branch))
if not self.args.no_update: if not self.args.no_update:
self.run_command("git reset --hard %s" % branch) git("reset --hard %s" % branch)
self.run_command("git clean -x -f -d -q") git("clean -x -f -d -q")
reqlist = [] reqlist = []
if os.path.exists('global-requirements.txt'): if os.path.exists('global-requirements.txt'):
reqlist.append('global-requirements.txt') reqlist.append('global-requirements.txt')