diff options
author | Ryan S. Arnold <ryan.arnold@linaro.org> | 2016-09-06 15:37:15 -0500 |
---|---|---|
committer | Ryan S. Arnold <ryan.arnold@linaro.org> | 2016-09-06 15:37:47 -0500 |
commit | 3cde4a2e1e8e727e9af66fa0aedfe18129780bb6 (patch) | |
tree | 8f5f7b7ecbad9cf503d353b658cd857b6cc42a0a /rn.py | |
parent | a4102e796b83c4fc03cef0831368eaf6389fd5ba (diff) |
Reorder code so user is only asked once each iteration if they'd like to modify README.textile.series.
Diffstat (limited to 'rn.py')
-rw-r--r-- | rn.py | 19 |
1 files changed, 5 insertions, 14 deletions
@@ -86,17 +86,11 @@ def generate(track, to_date, to_series, gccsource, persist): print "Please verify that your changes have been committed on the template branch:" next_rn.rn_template.log(1) - ans="y" - history="" - while not ans=="n": - # Only prompt for the history file once. - if not history: - history=finput('Please enter the location of the changelog csv file: ', "6.1-2016.06.csv") - - if next_rn.update_series_readmes(): - print "Please verify that your changes have been committed on the series branch:" - next_rn.rn_series.log(1) + ans=True + history=finput('Please enter the location of the changelog csv file: ', "6.1-2016.06.csv") + next_rn.update_series_readmes() + while ans==True: # Generate the temporary output files to the projdir. with cd(rnProj[0].projdir): try: @@ -104,13 +98,10 @@ def generate(track, to_date, to_series, gccsource, persist): except TemplateSyntaxError: traceback.print_exc(file=sys.stdout) print "Please correct the template and try again." - continue print "Please direct your browser to the rendered .html files in" print "%s and make sure that they look correct." % rnProj[0].projdir - print "Would you like to edit the series README.textile.series file" - ans=yninput( - "again and regenerate the release notes?", "N") + ans=next_rn.update_series_readmes() # Verify that the GCC Source is located where it says it is. class VerifyGCCSourceAction(argparse.Action): |