mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-04 10:36:17 +01:00
Code

changed default behaviour of importsrcpkg(). The files will not be committed by default. To commit them use the --commit switch.

Browse Source
This commit is contained in:
Marcus Hüwe 2007-07-30 18:11:52 +00:00
parent d6bdc3712f
commit 9921478c37
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osc/commandline.py
View File

@ -1626,7 +1626,7 @@ class Osc(cmdln.Cmdln):
help='set the description of the package')
@cmdln.option('', '--delete-old-files', action='store_true',
help='delete existing files from the server')
@cmdln.option('', '--disable-commit', action='store_true',
@cmdln.option('-c', '--commit', action='store_true',
help='do not commit the new files')
def do_importsrcpkg(self, subcmd, opts, srpm):
"""${cmd_name}: import a new package from a src.rpm
@ -1707,12 +1707,12 @@ class Osc(cmdln.Cmdln):
init_package_dir(conf.config['apiurl'], project, pac, os.path.join(project, pac))
unpack_srcrpm(srpm, os.getcwd())
p = Package(os.getcwd())
if len(p.filenamelist) == 0 and not opts.disable_commit:
if len(p.filenamelist) == 0 and opts.commit:
# TODO: moving this into the Package class
print 'Adding files to working copy...'
self.do_add(None, None, *glob.glob('*'))
p.commit()
elif not opts.disable_commit and opts.delete_old_files:
elif opts.commit and opts.delete_old_files:
delete_server_files(conf.config['apiurl'], project, pac, p.filenamelist)
p.update_local_filesmeta()
# TODO: moving this into the Package class
@ -1721,10 +1721,8 @@ class Osc(cmdln.Cmdln):
p.update_datastructs()
p.commit()
else:
print 'The package \'%s\' already exists on the server or the ' \
'\'--disable-commit\' switch was used. Please commit ' \
'this working copy manually or use the ' \
'\'--delete-old-files\' option.' % pac
print 'No files were committed to the server. Please ' \
'commit them manually.'
print 'Package \'%s\' only imported locally' % pac
sys.exit(1)
else: