mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-25 19:52:12 +01:00
Code

another attempt to fix the init_package_dir chdir mess

Browse Source
This commit is contained in:
Ludwig Nussel 2010-08-04 14:16:05 +02:00
parent ed2b8e111c
commit 118941047d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osc/core.py
View File

@ -2141,9 +2141,10 @@ def init_project_dir(apiurl, dir, project):
if conf.config['do_package_tracking']: if conf.config['do_package_tracking']:
store_write_initial_packages(dir, project, []) store_write_initial_packages(dir, project, [])
# XXX: the chdir semantics for this are really broken
def init_package_dir(apiurl, project, package, dir, revision=None, files=True, limit_size=None, meta=False): def init_package_dir(apiurl, project, package, dir, revision=None, files=True, limit_size=None, meta=False):
if not os.path.isdir(dir): if not os.path.isdir(dir):
os.mkdir(dir) os.makedirs(dir)
if not os.path.exists(os.path.join(dir, store)): if not os.path.exists(os.path.join(dir, store)):
os.mkdir(os.path.join(dir, store)) os.mkdir(os.path.join(dir, store))
@ -2166,7 +2167,6 @@ def init_package_dir(apiurl, project, package, dir, revision=None, files=True, l
store_write_string(dir, '_osclib_version', __store_version__ + '\n') store_write_string(dir, '_osclib_version', __store_version__ + '\n')
store_write_apiurl(dir, apiurl) store_write_apiurl(dir, apiurl)
def check_store_version(dir): def check_store_version(dir):
versionfile = os.path.join(dir, store, '_osclib_version') versionfile = os.path.join(dir, store, '_osclib_version')
try: try:
@ -3334,10 +3334,11 @@ def checkout_package(apiurl, project, package,
isfrozen = 1 isfrozen = 1
if x: if x:
revision = x revision = x
os.chdir(make_dir(apiurl, project, package, pathname, prj_dir)) dir = os.path.abspath(make_dir(apiurl, project, package, pathname, prj_dir))
init_package_dir(apiurl, project, package, store, revision, limit_size=limit_size, meta=meta) os.chdir(dir)
init_package_dir(apiurl, project, package, dir, revision, limit_size=limit_size, meta=meta)
os.chdir(os.pardir) os.chdir(os.pardir)
p = Package(package, progress_obj=progress_obj) p = Package(dir, progress_obj=progress_obj)
if isfrozen: if isfrozen:
p.mark_frozen() p.mark_frozen()
for filename in p.filenamelist: for filename in p.filenamelist: