Skip to content

Commit 8e0200a

Browse files
committed
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 ietf-tools#1467.
- Legacy-Id: 8362 Note: SVN reference [8238] has been migrated to Git commit c6e22bc
1 parent 3b59ccf commit 8e0200a

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

ietf/doc/utils.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -357,14 +357,15 @@ def update_telechat(request, doc, by, new_telechat_date, new_returning_item=None
357357

358358
e.save()
359359

360-
def rebuild_reference_relations(doc):
360+
def rebuild_reference_relations(doc,filename=None):
361361
if doc.type.slug != 'draft':
362362
return None
363363

364-
if doc.get_state_slug() == 'rfc':
365-
filename=os.path.join(settings.RFC_PATH,doc.canonical_name()+".txt")
366-
else:
367-
filename=os.path.join(settings.INTERNET_DRAFT_PATH,doc.filename_with_rev())
364+
if not filename:
365+
if doc.get_state_slug() == 'rfc':
366+
filename=os.path.join(settings.RFC_PATH,doc.canonical_name()+".txt")
367+
else:
368+
filename=os.path.join(settings.INTERNET_DRAFT_PATH,doc.filename_with_rev())
368369

369370
try:
370371
refs = draft.Draft(draft._gettext(filename), filename).get_refs()

ietf/submit/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def post_submission(request, submission):
159159

160160
update_authors(draft, submission)
161161

162-
trouble = rebuild_reference_relations(draft)
162+
trouble = rebuild_reference_relations(draft, filename=os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (submission.name, submission.rev)))
163163
if trouble:
164164
log('Rebuild_reference_relations trouble: %s'%trouble)
165165

0 commit comments

Comments
 (0)