From 8e0200abc998671390c97333f131b13ad651cf86 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 28 Sep 2014 18:32:00 +0000 Subject: [PATCH] Merged in [8238] from rjsparks@nostrum.com:\n Look in the right place in the filesystem for the files bits when building reference relations during submit. Fixes bug #1467. - Legacy-Id: 8362 Note: SVN reference [8238] has been migrated to Git commit c6e22bc429e3c77fd2d5be6d78c20a0c90cbc80b --- ietf/doc/utils.py | 11 ++++++----- ietf/submit/utils.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py index 6cd494b00..41b4a92b6 100644 --- a/ietf/doc/utils.py +++ b/ietf/doc/utils.py @@ -357,14 +357,15 @@ def update_telechat(request, doc, by, new_telechat_date, new_returning_item=None e.save() -def rebuild_reference_relations(doc): +def rebuild_reference_relations(doc,filename=None): if doc.type.slug != 'draft': return None - if doc.get_state_slug() == 'rfc': - filename=os.path.join(settings.RFC_PATH,doc.canonical_name()+".txt") - else: - filename=os.path.join(settings.INTERNET_DRAFT_PATH,doc.filename_with_rev()) + if not filename: + if doc.get_state_slug() == 'rfc': + filename=os.path.join(settings.RFC_PATH,doc.canonical_name()+".txt") + else: + filename=os.path.join(settings.INTERNET_DRAFT_PATH,doc.filename_with_rev()) try: refs = draft.Draft(draft._gettext(filename), filename).get_refs() diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py index d9563a996..79020b7f8 100644 --- a/ietf/submit/utils.py +++ b/ietf/submit/utils.py @@ -159,7 +159,7 @@ def post_submission(request, submission): update_authors(draft, submission) - trouble = rebuild_reference_relations(draft) + trouble = rebuild_reference_relations(draft, filename=os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (submission.name, submission.rev))) if trouble: log('Rebuild_reference_relations trouble: %s'%trouble)