diff --git a/ietf/checks.py b/ietf/checks.py index 3eb935177..01ba3ab94 100644 --- a/ietf/checks.py +++ b/ietf/checks.py @@ -359,37 +359,46 @@ def maybe_patch_library(app_configs, **kwargs): django_path = os.path.dirname(django.__file__) library_path = os.path.dirname(django_path) saved_cwd = os.getcwd() - os.chdir(library_path) # All patches in settings.CHECKS_LIBRARY_PATCHES_TO_APPLY must have a # relative file path rooted in the django dir, for instance # 'django/db/models/fields/__init__.py' for patch_file in settings.CHECKS_LIBRARY_PATCHES_TO_APPLY: - patch_path = os.path.join(saved_cwd, patch_file) - patch_set = patch.fromfile(patch_path) - if not hasattr(patch_set, 'already_patched'): - patch_set.already_patched = False - if patch_set: - applied = patch_set.apply() - if not applied: - errors.append(checks.Warning( - "Could not apply patch from file '%s'"%patch_file, - hint="Make sure that the patch file contains a unified diff and has valid file paths", - id="datatracker.W0002", - )) - elif patch_set.already_patched: - #for p in patch_set: - # sys.stderr.write(" Already patched: %s\n" % p.target) - pass + try: + patch_path = os.path.join(saved_cwd, patch_file) + patch_set = patch.fromfile(patch_path) + if not hasattr(patch_set, 'already_patched'): + patch_set.already_patched = False + if patch_set: + os.chdir(library_path) + applied = patch_set.apply() + os.chdir(saved_cwd) + if not applied: + errors.append(checks.Warning( + "Could not apply patch from file '%s'"%patch_file, + hint="Make sure that the patch file contains a unified diff and has valid file paths", + id="datatracker.W0002", + )) + elif patch_set.already_patched: + #for p in patch_set: + # sys.stderr.write(" Already patched: %s\n" % p.target) + pass + else: + for p in patch_set: + sys.stderr.write(" Patched %s\n" % p.target) else: - for p in patch_set: - sys.stderr.write(" Patched %s\n" % p.target) - else: - errors.append(checks.Warning( - "Could not parse patch file '%s'"%patch_file, - hint="Make sure that the patch file contains a unified diff", - id="datatracker.W0001", - )) - os.chdir(saved_cwd) + errors.append(checks.Warning( + "Could not parse patch file '%s'"%patch_file, + hint="Make sure that the patch file contains a unified diff", + id="datatracker.W0001", + )) + except IOError as e: + errors.append( + checks.Warning("Could not apply patch from %s: %s" % (patch_file, e), + hint="Check file permissions and locations", + id="datatracker.W0003", + ) + ) + pass return errors @checks.register('security') diff --git a/ietf/community/migrations/0002_auto_20180220_1052.py b/ietf/community/migrations/0002_auto_20180220_1052.py new file mode 100644 index 000000000..2e3f85b17 --- /dev/null +++ b/ietf/community/migrations/0002_auto_20180220_1052.py @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-02-20 10:52 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import ietf.utils.models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('doc', '0001_initial'), + ('group', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('community', '0001_initial'), + ('person', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='searchrule', + name='group', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'), + ), + migrations.AddField( + model_name='searchrule', + name='name_contains_index', + field=models.ManyToManyField(to='doc.Document'), + ), + migrations.AddField( + model_name='searchrule', + name='person', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Person'), + ), + migrations.AddField( + model_name='searchrule', + name='state', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.State'), + ), + migrations.AddField( + model_name='emailsubscription', + name='community_list', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='community.CommunityList'), + ), + migrations.AddField( + model_name='emailsubscription', + name='email', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Email'), + ), + migrations.AddField( + model_name='communitylist', + name='added_docs', + field=models.ManyToManyField(to='doc.Document'), + ), + migrations.AddField( + model_name='communitylist', + name='group', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'), + ), + migrations.AddField( + model_name='communitylist', + name='user', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py b/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py new file mode 100644 index 000000000..e6926053c --- /dev/null +++ b/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-02-20 10:52 +from __future__ import unicode_literals + +from django.db import migrations +import django.db.models.deletion +import ietf.utils.models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('group', '0001_initial'), + ('name', '0001_initial'), + ('dbtemplate', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='dbtemplate', + name='group', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'), + ), + migrations.AddField( + model_name='dbtemplate', + name='type', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DBTemplateTypeName'), + ), + ] diff --git a/ietf/doc/migrations/0002_auto_20180220_1052.py b/ietf/doc/migrations/0002_auto_20180220_1052.py new file mode 100644 index 000000000..6cce3e312 --- /dev/null +++ b/ietf/doc/migrations/0002_auto_20180220_1052.py @@ -0,0 +1,236 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-02-20 10:52 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import ietf.utils.models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('review', '0001_initial'), + ('contenttypes', '0002_remove_content_type_name'), + ('name', '0001_initial'), + ('submit', '0001_initial'), + ('person', '0001_initial'), + ('message', '0001_initial'), + ('doc', '0001_initial'), + ('group', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='document', + name='group', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'), + ), + migrations.AddField( + model_name='document', + name='intended_std_level', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.IntendedStdLevelName', verbose_name=b'Intended standardization level'), + ), + migrations.AddField( + model_name='document', + name='shepherd', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shepherd_document_set', to='person.Email'), + ), + migrations.AddField( + model_name='document', + name='states', + field=models.ManyToManyField(blank=True, to='doc.State'), + ), + migrations.AddField( + model_name='document', + name='std_level', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StdLevelName', verbose_name=b'Standardization level'), + ), + migrations.AddField( + model_name='document', + name='stream', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StreamName'), + ), + migrations.AddField( + model_name='document', + name='tags', + field=models.ManyToManyField(blank=True, to='name.DocTagName'), + ), + migrations.AddField( + model_name='document', + name='type', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.DocTypeName'), + ), + migrations.AddField( + model_name='docreminder', + name='event', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.DocEvent'), + ), + migrations.AddField( + model_name='docreminder', + name='type', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocReminderTypeName'), + ), + migrations.AddField( + model_name='dochistoryauthor', + name='document', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documentauthor_set', to='doc.DocHistory'), + ), + migrations.AddField( + model_name='dochistoryauthor', + name='email', + field=ietf.utils.models.ForeignKey(blank=True, help_text=b'Email address used by author for submission', null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Email'), + ), + migrations.AddField( + model_name='dochistoryauthor', + name='person', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'), + ), + migrations.AddField( + model_name='dochistory', + name='ad', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_dochistory_set', to='person.Person', verbose_name=b'area director'), + ), + migrations.AddField( + model_name='dochistory', + name='doc', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='history_set', to='doc.Document'), + ), + migrations.AddField( + model_name='dochistory', + name='formal_languages', + field=models.ManyToManyField(blank=True, help_text=b'Formal languages used in document', to='name.FormalLanguageName'), + ), + migrations.AddField( + model_name='dochistory', + name='group', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='group.Group'), + ), + migrations.AddField( + model_name='dochistory', + name='intended_std_level', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.IntendedStdLevelName', verbose_name=b'Intended standardization level'), + ), + migrations.AddField( + model_name='dochistory', + name='shepherd', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shepherd_dochistory_set', to='person.Email'), + ), + migrations.AddField( + model_name='dochistory', + name='states', + field=models.ManyToManyField(blank=True, to='doc.State'), + ), + migrations.AddField( + model_name='dochistory', + name='std_level', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StdLevelName', verbose_name=b'Standardization level'), + ), + migrations.AddField( + model_name='dochistory', + name='stream', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.StreamName'), + ), + migrations.AddField( + model_name='dochistory', + name='tags', + field=models.ManyToManyField(blank=True, to='name.DocTagName'), + ), + migrations.AddField( + model_name='dochistory', + name='type', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.DocTypeName'), + ), + migrations.AddField( + model_name='docevent', + name='by', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'), + ), + migrations.AddField( + model_name='docevent', + name='doc', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'), + ), + migrations.AddField( + model_name='docalias', + name='document', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document'), + ), + migrations.AddField( + model_name='deletedevent', + name='by', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'), + ), + migrations.AddField( + model_name='deletedevent', + name='content_type', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'), + ), + migrations.AddField( + model_name='ballottype', + name='doc_type', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.DocTypeName'), + ), + migrations.AddField( + model_name='ballottype', + name='positions', + field=models.ManyToManyField(blank=True, to='name.BallotPositionName'), + ), + migrations.AddField( + model_name='submissiondocevent', + name='submission', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='submit.Submission'), + ), + migrations.AddField( + model_name='statedocevent', + name='state', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.State'), + ), + migrations.AddField( + model_name='statedocevent', + name='state_type', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.StateType'), + ), + migrations.AddField( + model_name='reviewrequestdocevent', + name='review_request', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='review.ReviewRequest'), + ), + migrations.AddField( + model_name='reviewrequestdocevent', + name='state', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='name.ReviewRequestStateName'), + ), + migrations.AddField( + model_name='ballotpositiondocevent', + name='ad', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person'), + ), + migrations.AddField( + model_name='ballotpositiondocevent', + name='ballot', + field=ietf.utils.models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='doc.BallotDocEvent'), + ), + migrations.AddField( + model_name='ballotpositiondocevent', + name='pos', + field=ietf.utils.models.ForeignKey(default=b'norecord', on_delete=django.db.models.deletion.CASCADE, to='name.BallotPositionName', verbose_name=b'position'), + ), + migrations.AddField( + model_name='ballotdocevent', + name='ballot_type', + field=ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.BallotType'), + ), + migrations.AddField( + model_name='addedmessageevent', + name='in_reply_to', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='doc_irtomanual', to='message.Message'), + ), + migrations.AddField( + model_name='addedmessageevent', + name='message', + field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='doc_manualevents', to='message.Message'), + ), + ]