From 6ac693e7056a2ed63a89f906bee48a03f38c8801 Mon Sep 17 00:00:00 2001 From: j Date: Fri, 5 May 2017 11:42:39 +0200 Subject: [PATCH] new tar wants exclude before folder --- oml/commands.py | 5 +++-- oml/item/models.py | 1 + oml/user/models.py | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/oml/commands.py b/oml/commands.py index 3b79938..af29d86 100644 --- a/oml/commands.py +++ b/oml/commands.py @@ -227,7 +227,7 @@ def command_release(*args): MODULES += list(PLATFORM_MODULES) VERSIONS = {module:version(module) for module in MODULES} - EXCLUDE=[ + EXCLUDE = [ '--exclude', '.git', '--exclude', '.bzr', '--exclude', 'pip_cache', '--exclude', '.*.swp', '--exclude', '._*', '--exclude', '.DS_Store', @@ -238,7 +238,7 @@ def command_release(*args): for module in MODULES: tar = join('updates', '%s-%s.tar.bz2' % (module, VERSIONS[module])) if not exists(tar): - cmd = ['tar', 'cvjf', tar, '%s/' % module] + EXCLUDE + cmd = ['tar', 'cvjf', tar] + EXCLUDE if module in ('openmedialibrary', ): cmd += ['--exclude', '*.pyc'] if module == 'openmedialibrary': @@ -247,6 +247,7 @@ def command_release(*args): cmd += ['--exclude', 'oxjs/examples'] if module == 'platform_win32': cmd += ['--exclude', 'build', '--exclude', 'dist'] + cmd += [module + '/'] run(*cmd) release = {} release['modules'] = {module: { diff --git a/oml/item/models.py b/oml/item/models.py index d98f832..5fa1a75 100644 --- a/oml/item/models.py +++ b/oml/item/models.py @@ -625,6 +625,7 @@ class Sort(db.Model): state.db.session.commit() return f + Item.sort_keys = [] for key in config['itemKeys']: if key.get('sort'): diff --git a/oml/user/models.py b/oml/user/models.py index 5752910..03d78f1 100644 --- a/oml/user/models.py +++ b/oml/user/models.py @@ -236,6 +236,7 @@ class User(db.Model): Changelog.record(self, 'editcontact', settings.preferences.get('contact'), _commit=False) state.db.session.commit() + list_items = sa.Table('listitem', db.metadata, sa.Column('list_id', sa.Integer(), sa.ForeignKey('list.id')), sa.Column('item_id', sa.String(32), sa.ForeignKey('item.id')))