new tar wants exclude before folder

This commit is contained in:
j 2017-05-05 11:42:39 +02:00
parent 73b8658c99
commit 6ac693e705
3 changed files with 5 additions and 2 deletions

View file

@ -227,7 +227,7 @@ def command_release(*args):
MODULES += list(PLATFORM_MODULES) MODULES += list(PLATFORM_MODULES)
VERSIONS = {module:version(module) for module in MODULES} VERSIONS = {module:version(module) for module in MODULES}
EXCLUDE=[ EXCLUDE = [
'--exclude', '.git', '--exclude', '.bzr', '--exclude', '.git', '--exclude', '.bzr',
'--exclude', 'pip_cache', '--exclude', 'pip_cache',
'--exclude', '.*.swp', '--exclude', '._*', '--exclude', '.DS_Store', '--exclude', '.*.swp', '--exclude', '._*', '--exclude', '.DS_Store',
@ -238,7 +238,7 @@ def command_release(*args):
for module in MODULES: for module in MODULES:
tar = join('updates', '%s-%s.tar.bz2' % (module, VERSIONS[module])) tar = join('updates', '%s-%s.tar.bz2' % (module, VERSIONS[module]))
if not exists(tar): if not exists(tar):
cmd = ['tar', 'cvjf', tar, '%s/' % module] + EXCLUDE cmd = ['tar', 'cvjf', tar] + EXCLUDE
if module in ('openmedialibrary', ): if module in ('openmedialibrary', ):
cmd += ['--exclude', '*.pyc'] cmd += ['--exclude', '*.pyc']
if module == 'openmedialibrary': if module == 'openmedialibrary':
@ -247,6 +247,7 @@ def command_release(*args):
cmd += ['--exclude', 'oxjs/examples'] cmd += ['--exclude', 'oxjs/examples']
if module == 'platform_win32': if module == 'platform_win32':
cmd += ['--exclude', 'build', '--exclude', 'dist'] cmd += ['--exclude', 'build', '--exclude', 'dist']
cmd += [module + '/']
run(*cmd) run(*cmd)
release = {} release = {}
release['modules'] = {module: { release['modules'] = {module: {

View file

@ -625,6 +625,7 @@ class Sort(db.Model):
state.db.session.commit() state.db.session.commit()
return f return f
Item.sort_keys = [] Item.sort_keys = []
for key in config['itemKeys']: for key in config['itemKeys']:
if key.get('sort'): if key.get('sort'):

View file

@ -236,6 +236,7 @@ class User(db.Model):
Changelog.record(self, 'editcontact', settings.preferences.get('contact'), _commit=False) Changelog.record(self, 'editcontact', settings.preferences.get('contact'), _commit=False)
state.db.session.commit() state.db.session.commit()
list_items = sa.Table('listitem', db.metadata, list_items = sa.Table('listitem', db.metadata,
sa.Column('list_id', sa.Integer(), sa.ForeignKey('list.id')), sa.Column('list_id', sa.Integer(), sa.ForeignKey('list.id')),
sa.Column('item_id', sa.String(32), sa.ForeignKey('item.id'))) sa.Column('item_id', sa.String(32), sa.ForeignKey('item.id')))