You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2019/10/29 23:21:04 UTC

svn commit: r1869134 - /subversion/trunk/tools/dist/release.py

Author: danielsh
Date: Tue Oct 29 23:21:04 2019
New Revision: 1869134

URL: http://svn.apache.org/viewvc?rev=1869134&view=rev
Log:
* tools/dist/release.py
  (write_news): Validate the argument to the --news-release-date option.
    Follow-up to r1869118.

Modified:
    subversion/trunk/tools/dist/release.py

Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1869134&r1=1869133&r2=1869134&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Tue Oct 29 23:21:04 2019
@@ -1188,9 +1188,13 @@ def move_to_dist(args):
 
 def write_news(args):
     'Write text for the Subversion website.'
-    release_date = args.news_release_date or datetime.date.today().strftime('%Y-%m-%d')
-    data = { 'date' : re.sub("-", "", release_date),  # format YYYYmmdd
-             'date_pres' : release_date,              # format YYYY-mm-dd
+    if args.news_release_date:
+        release_date = datetime.datetime.strptime(args.news_release_date, '%Y-%m-%d')
+    else:
+        release_date = datetime.date.today()
+    abort
+    data = { 'date' : release_date.strftime('%Y%m%d'),
+             'date_pres' : release_date.strftime('%Y-%m-%d'),
              'major-minor' : args.version.branch,
              'version' : str(args.version),
              'version_base' : args.version.base,



Re: svn commit: r1869134 - /subversion/trunk/tools/dist/release.py

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
James McCoy wrote on Wed, 30 Oct 2019 02:03 +00:00:
> On Tue, Oct 29, 2019 at 11:21:04PM -0000, danielsh@apache.org wrote:
> > +    abort
>        --^
> Left over debug code?

Yes, thanks.  Fixed in r1869139.

Re: svn commit: r1869134 - /subversion/trunk/tools/dist/release.py

Posted by James McCoy <ja...@jamessan.com>.
On Tue, Oct 29, 2019 at 11:21:04PM -0000, danielsh@apache.org wrote:
> Author: danielsh
> Date: Tue Oct 29 23:21:04 2019
> New Revision: 1869134
> 
> URL: http://svn.apache.org/viewvc?rev=1869134&view=rev
> Log:
> * tools/dist/release.py
>   (write_news): Validate the argument to the --news-release-date option.
>     Follow-up to r1869118.
> 
> Modified:
>     subversion/trunk/tools/dist/release.py
> 
> Modified: subversion/trunk/tools/dist/release.py
> URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1869134&r1=1869133&r2=1869134&view=diff
> ==============================================================================
> --- subversion/trunk/tools/dist/release.py (original)
> +++ subversion/trunk/tools/dist/release.py Tue Oct 29 23:21:04 2019
> @@ -1188,9 +1188,13 @@ def move_to_dist(args):
>  
>  def write_news(args):
>      'Write text for the Subversion website.'
> -    release_date = args.news_release_date or datetime.date.today().strftime('%Y-%m-%d')
> -    data = { 'date' : re.sub("-", "", release_date),  # format YYYYmmdd
> -             'date_pres' : release_date,              # format YYYY-mm-dd
> +    if args.news_release_date:
> +        release_date = datetime.datetime.strptime(args.news_release_date, '%Y-%m-%d')
> +    else:
> +        release_date = datetime.date.today()
> +    abort
       --^
Left over debug code?

Cheers,
-- 
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB