mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-08 20:15:47 +01:00
Code

- support for local defined source services during commit. Move old validation and trylocal source service run into commit function

Browse Source
This commit is contained in:
Adrian Schröter 2011-05-25 13:34:32 +02:00
parent c00751f4d7
commit 48a8fa144f
3 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -8,6 +8,7 @@
- osc waits and updates package after checkin when a source service is used - osc waits and updates package after checkin when a source service is used
- support for the new service file mode for "update" and "checkout" command when - support for the new service file mode for "update" and "checkout" command when
downloading server side generated files downloading server side generated files
- integration for local source services, they will replace the source_validator mechanism
0.131 0.131
- new command 'develproject' to print the devel project from the package meta. - new command 'develproject' to print the devel project from the package meta.

23
osc/commandline.py
View File

@ -3471,8 +3471,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
help='force commit - do not tests a file list') help='force commit - do not tests a file list')
@cmdln.option('--skip-validation', default=False, action="store_true", @cmdln.option('--skip-validation', default=False, action="store_true",
help='Skip the source validation') help='Skip the source validation')
@cmdln.option('--verbose-validation', default=False, action="store_true", @cmdln.option('-v', '--verbose', default=False, action="store_true",
help='Run the source validation with verbose information') help='Run the source services and validation with verbose information')
@cmdln.option('--skip-local-service-run', default=False, action="store_true",
help='Skip service run of \'localonly\' or \'trylocal\' configured source services')
def do_commit(self, subcmd, opts, *args): def do_commit(self, subcmd, opts, *args):
"""${cmd_name}: Upload content to the repository server """${cmd_name}: Upload content to the repository server
@ -3525,20 +3527,16 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if conf.config['do_package_tracking'] and is_project_dir(arg): if conf.config['do_package_tracking'] and is_project_dir(arg):
try: try:
prj = Project(arg) prj = Project(arg)
prj.validate_pacs(validators, opts.verbose_validation)
if not msg: if not msg:
msg = edit_message() msg = edit_message()
prj.commit(msg=msg) prj.commit(validators_dir=validators, msg=msg, skip_local_service_run=opts.skip_local_service_run, verbose=opts.verbose)
except oscerr.ExtRuntimeError, e: except oscerr.ExtRuntimeError, e:
print >>sys.stderr, "ERROR: source_validator failed", e print >>sys.stderr, "ERROR: service run failed", e
return 1 return 1
args.remove(arg) args.remove(arg)
pacs = findpacs(args) pacs = findpacs(args)
if conf.config['check_filelist'] and not opts.force:
check_filelist_before_commit(pacs)
if conf.config['do_package_tracking'] and len(pacs) > 0: if conf.config['do_package_tracking'] and len(pacs) > 0:
prj_paths = {} prj_paths = {}
single_paths = [] single_paths = []
@ -3558,25 +3556,22 @@ Please submit there instead, or use --nodevelproject to force direct submission.
single_paths.append(pac.dir) single_paths.append(pac.dir)
for prj_path, packages in prj_paths.iteritems(): for prj_path, packages in prj_paths.iteritems():
prj = Project(prj_path) prj = Project(prj_path)
prj.validate_pacs(validators, opts.verbose_validation, *packages)
if not msg: if not msg:
msg = get_commit_msg(prj.absdir, pac_objs[prj_path]) msg = get_commit_msg(prj.absdir, pac_objs[prj_path])
prj.commit(packages, msg=msg, files=files) prj.commit(packages, validators_dir=validators, msg=msg, files=files, skip_local_service_run=opts.skip_local_service_run, verbose=opts.verbose)
store_unlink_file(prj.absdir, '_commit_msg') store_unlink_file(prj.absdir, '_commit_msg')
for pac in single_paths: for pac in single_paths:
p = Package(pac) p = Package(pac)
p.validate(validators, opts.verbose_validation)
if not msg: if not msg:
msg = get_commit_msg(p.absdir, [p]) msg = get_commit_msg(p.absdir, [p])
p.commit(msg) p.commit(msg, validators_dir=validators, skip_local_service_run=opts.skip_local_service_run, verbose=opts.verbose)
store_unlink_file(p.absdir, '_commit_msg') store_unlink_file(p.absdir, '_commit_msg')
else: else:
for p in pacs: for p in pacs:
p = Package(pac) p = Package(pac)
p.validate(validators, opts.verbose_validation)
if not msg: if not msg:
msg = get_commit_msg(p.absdir, [p]) msg = get_commit_msg(p.absdir, [p])
p.commit(msg) p.commit(msg, validators_dir=validators, skip_local_service_run=opts.skip_local_service_run, verbose=opts.verbose)
store_unlink_file(p.absdir, '_commit_msg') store_unlink_file(p.absdir, '_commit_msg')
@cmdln.option('-r', '--revision', metavar='REV', @cmdln.option('-r', '--revision', metavar='REV',

46
osc/core.py
View File

@ -302,7 +302,7 @@ class Serviceinfo:
r.append( s ) r.append( s )
return r return r
def execute(self, dir, callmode = None, singleservice = None): def execute(self, dir, callmode = None, singleservice = None, verbose = None):
import tempfile import tempfile
# cleanup existing generated files # cleanup existing generated files
@ -325,13 +325,15 @@ class Serviceinfo:
continue continue
if service['mode'] != "disabled" and callmode == "disabled": if service['mode'] != "disabled" and callmode == "disabled":
continue continue
if service['mode'] != "trylocal" and service['mode'] != "localonly" and callmode == "trylocal":
continue
call = service['command'] call = service['command']
temp_dir = tempfile.mkdtemp() temp_dir = tempfile.mkdtemp()
name = call.split(None, 1)[0] name = call.split(None, 1)[0]
if not os.path.exists("/usr/lib/obs/service/"+name): if not os.path.exists("/usr/lib/obs/service/"+name):
raise oscerr.PackageNotInstalled("obs-service-"+name) raise oscerr.PackageNotInstalled("obs-service-"+name)
c = "/usr/lib/obs/service/" + call + " --outdir " + temp_dir c = "/usr/lib/obs/service/" + call + " --outdir " + temp_dir
if conf.config['verbose'] > 1: if conf.config['verbose'] > 1 or verbose:
print "Run source service:", c print "Run source service:", c
r = subprocess.call(c, shell=True) r = subprocess.call(c, shell=True)
if r != 0: if r != 0:
@ -341,7 +343,7 @@ class Serviceinfo:
print " (your _services file may be corrupt now)" print " (your _services file may be corrupt now)"
ret = r ret = r
if service['mode'] == "disabled" or service['mode'] == "trylocal" or service['mode'] == "localonly" or callmode == "local": if service['mode'] == "disabled" or service['mode'] == "trylocal" or service['mode'] == "localonly" or callmode == "local" or callmode == "trylocal":
for filename in os.listdir(temp_dir): for filename in os.listdir(temp_dir):
shutil.move( os.path.join(temp_dir, filename), os.path.join(dir, filename) ) shutil.move( os.path.join(temp_dir, filename), os.path.join(dir, filename) )
else: else:
@ -727,6 +729,7 @@ class Project:
finally: finally:
self.write_packages() self.write_packages()
# TO BE OBSOLETED WITH SOURCE SERVICE VALIDATORS
def validate_pacs(self, validators, verbose_validation=False, *pacs): def validate_pacs(self, validators, verbose_validation=False, *pacs):
if len(pacs) == 0: if len(pacs) == 0:
for pac in self.pacs_broken: for pac in self.pacs_broken:
@ -744,7 +747,8 @@ class Project:
p = Package(os.path.join(self.dir, pac)) p = Package(os.path.join(self.dir, pac))
p.validate(validators, verbose_validation) p.validate(validators, verbose_validation)
def commit(self, pacs = (), msg = '', files = {}, validators_dir = None, verbose_validation = False):
def commit(self, pacs = (), msg = '', files = {}, validators_dir = None, verbose = False, skip_local_service_run = False):
if len(pacs): if len(pacs):
try: try:
for pac in pacs: for pac in pacs:
@ -753,7 +757,7 @@ class Project:
todo = files[pac] todo = files[pac]
state = self.get_state(pac) state = self.get_state(pac)
if state == 'A': if state == 'A':
self.commitNewPackage(pac, msg, todo, validators_dir=validators_dir, verbose_validation=verbose_validation) self.commitNewPackage(pac, msg, todo, validators_dir=validators_dir, verbose=verbose, skip_local_service_run=skip_local_service_run)
elif state == 'D': elif state == 'D':
self.commitDelPackage(pac) self.commitDelPackage(pac)
elif state == ' ': elif state == ' ':
@ -763,13 +767,13 @@ class Project:
else: else:
p = Package(os.path.join(self.dir, pac)) p = Package(os.path.join(self.dir, pac))
p.todo = todo p.todo = todo
p.commit(msg, validators_dir=validators_dir, verbose_validation=verbose_validation) p.commit(msg, validators_dir=validators_dir, verbose=verbose, skip_local_service_run=skip_local_service_run)
elif pac in self.pacs_unvers and not is_package_dir(os.path.join(self.dir, pac)): elif pac in self.pacs_unvers and not is_package_dir(os.path.join(self.dir, pac)):
print 'osc: \'%s\' is not under version control' % pac print 'osc: \'%s\' is not under version control' % pac
elif pac in self.pacs_broken: elif pac in self.pacs_broken:
print 'osc: \'%s\' package not found' % pac print 'osc: \'%s\' package not found' % pac
elif state == None: elif state == None:
self.commitExtPackage(pac, msg, todo, validators_dir=validators_dir, verbose_validation=verbose_validation) self.commitExtPackage(pac, msg, todo, validators_dir=validators_dir, verbose=verbose)
finally: finally:
self.write_packages() self.write_packages()
else: else:
@ -783,15 +787,15 @@ class Project:
state = self.get_state(pac) state = self.get_state(pac)
if state == ' ': if state == ' ':
# do a simple commit # do a simple commit
Package(os.path.join(self.dir, pac)).commit(msg, validators_dir=validators_dir, verbose_validation=verbose_validation) Package(os.path.join(self.dir, pac)).commit(msg, validators_dir=validators_dir, verbose=verbose, skip_local_service_run=skip_local_service_run)
elif state == 'D': elif state == 'D':
self.commitDelPackage(pac) self.commitDelPackage(pac)
elif state == 'A': elif state == 'A':
self.commitNewPackage(pac, msg, validators_dir=validators_dir, verbose_validation=verbose_validation) self.commitNewPackage(pac, msg, validators_dir=validators_dir, verbose=verbose, skip_local_service_run=skip_local_service_run)
finally: finally:
self.write_packages() self.write_packages()
def commitNewPackage(self, pac, msg = '', files = [], validators_dir = None, verbose_validation = False): def commitNewPackage(self, pac, msg = '', files = [], validators_dir = None, verbose = False, skip_local_service_run = False):
"""creates and commits a new package if it does not exist on the server""" """creates and commits a new package if it does not exist on the server"""
if pac in self.pacs_available: if pac in self.pacs_available:
print 'package \'%s\' already exists' % pac print 'package \'%s\' already exists' % pac
@ -812,7 +816,7 @@ class Project:
p = Package(os.path.join(self.dir, pac)) p = Package(os.path.join(self.dir, pac))
p.todo = files p.todo = files
print statfrmt('Sending', os.path.normpath(p.dir)) print statfrmt('Sending', os.path.normpath(p.dir))
p.commit(msg=msg, validators_dir=validators_dir, verbose_validation=verbose_validation) p.commit(msg=msg, validators_dir=validators_dir, verbose=verbose, skip_local_service_run=skip_local_service_run)
self.set_state(pac, ' ') self.set_state(pac, ' ')
os.chdir(olddir) os.chdir(olddir)
@ -838,7 +842,7 @@ class Project:
delete_package(self.apiurl, self.name, pac) delete_package(self.apiurl, self.name, pac)
self.del_package_node(pac) self.del_package_node(pac)
def commitExtPackage(self, pac, msg, files = [], validators_dir=None, verbose_validation=False): def commitExtPackage(self, pac, msg, files = [], validators_dir=None, verbose=False):
"""commits a package from an external project""" """commits a package from an external project"""
if os_path_samefile(os.path.join(self.dir, pac), os.getcwd()): if os_path_samefile(os.path.join(self.dir, pac), os.getcwd()):
pac_path = '.' pac_path = '.'
@ -857,7 +861,7 @@ class Project:
template_args=({'name': pac, 'user': user}), apiurl=apiurl) template_args=({'name': pac, 'user': user}), apiurl=apiurl)
p = Package(pac_path) p = Package(pac_path)
p.todo = files p.todo = files
p.commit(msg=msg, validators_dir=validators_dir, verbose_validation=verbose_validation) p.commit(msg=msg, validators_dir=validators_dir, verbose=verbose)
def __str__(self): def __str__(self):
r = [] r = []
@ -1205,14 +1209,20 @@ class Package:
if p.wait() != 0: if p.wait() != 0:
raise oscerr.ExtRuntimeError('ERROR: source_validator failed:\n%s' % p.stdout, validator) raise oscerr.ExtRuntimeError('ERROR: source_validator failed:\n%s' % p.stdout, validator)
def commit(self, msg='', validators_dir=None, verbose_validation=False): def commit(self, msg='', validators_dir=None, verbose=False, skip_local_service_run=False):
# commit only if the upstream revision is the same as the working copy's # commit only if the upstream revision is the same as the working copy's
upstream_rev = self.latest_rev() upstream_rev = self.latest_rev()
if self.rev != upstream_rev: if self.rev != upstream_rev:
raise oscerr.WorkingCopyOutdated((self.absdir, self.rev, upstream_rev)) raise oscerr.WorkingCopyOutdated((self.absdir, self.rev, upstream_rev))
if not skip_local_service_run:
r = self.run_source_services(mode="trylocal", verbose=verbose)
if r is not 0:
print "osc: source service run failed", r
raise oscerr.ServiceRuntimeError(r)
if not validators_dir is None: if not validators_dir is None:
self.validate(validators_dir, verbose_validation) self.validate(validators_dir, verbose)
if not self.todo: if not self.todo:
self.todo = [i for i in self.to_be_added if not i in self.filenamelist] + self.filenamelist self.todo = [i for i in self.to_be_added if not i in self.filenamelist] + self.filenamelist
@ -2041,7 +2051,7 @@ rev: %s
print 'At revision %s.' % self.rev print 'At revision %s.' % self.rev
def run_source_services(self, mode=None, singleservice=None): def run_source_services(self, mode=None, singleservice=None, verbose=None):
curdir = os.getcwd() curdir = os.getcwd()
os.chdir(self.absdir) # e.g. /usr/lib/obs/service/verify_file fails if not inside the project dir. os.chdir(self.absdir) # e.g. /usr/lib/obs/service/verify_file fails if not inside the project dir.
si = Serviceinfo() si = Serviceinfo()
@ -2049,7 +2059,7 @@ rev: %s
service = ET.parse(os.path.join(self.absdir, '_service')).getroot() service = ET.parse(os.path.join(self.absdir, '_service')).getroot()
si.read(service) si.read(service)
si.getProjectGlobalServices(self.apiurl, self.prjname, self.name) si.getProjectGlobalServices(self.apiurl, self.prjname, self.name)
r = si.execute(self.absdir, mode, singleservice) r = si.execute(self.absdir, mode, singleservice, verbose)
os.chdir(curdir) os.chdir(curdir)
return r return r
@ -4193,7 +4203,7 @@ def checkout_package(apiurl, project, package,
prj_obj.write_packages() prj_obj.write_packages()
p.update(revision, server_service_files, size_limit) p.update(revision, server_service_files, size_limit)
if service_files: if service_files:
print 'Running local source services' print 'Running all source services local'
p.run_source_services() p.run_source_services()
def replace_pkg_meta(pkgmeta, new_name, new_prj, keep_maintainers = False, def replace_pkg_meta(pkgmeta, new_name, new_prj, keep_maintainers = False,