@@ -85,10 +85,6 @@ def main():
8585 die ('"a" must not exist in the current directory.' )
8686 if os .path .lexists ('b' ):
8787 die ('"b" must not exist in the current directory.' )
88- if os .path .lexists ('patches.gen' ):
89- die ('"patches.gen" must not exist in the current directory.' )
90-
91- check_git_state (args .master_branch , True , 'patches' )
9288
9389 curversion = get_rsync_version ()
9490
@@ -124,8 +120,6 @@ def main():
124120 if not re .match (r'^del' , ans , flags = re .I ):
125121 die ("Aborted" )
126122 cmd_chk (['git' , 'tag' , '-d' , v_ver ])
127- if os .path .isdir ('patches/.git' ):
128- cmd_chk (f"cd patches && git tag -d '{ v_ver } '" )
129123
130124 version = re .sub (r'[-.]*pre[-.]*' , 'pre' , version )
131125 if 'pre' in version and not curversion .endswith ('dev' ):
@@ -259,7 +253,6 @@ About to:
259253 cmd_run ("git diff" .split ())
260254
261255 srctar_name = f"{ rsync_ver } .tar.gz"
262- pattar_name = f"rsync-patches-{ version } .tar.gz"
263256 diff_name = f"{ rsync_lastver } -{ version } .diffs.gz"
264257 srctar_file = os .path .join (dest , srcdir , srctar_name )
265258 pattar_file = os .path .join (dest , srcdir , pattar_name )
@@ -273,8 +266,6 @@ About to:
273266 - git commit all changes
274267 - run a full build, ensuring that the manpages & configure.sh are up-to-date
275268 - merge the { args .master_branch } branch into the patch/{ args .master_branch } /* branches
276- - update the files in the "patches" dir and OPTIONALLY (if you type 'y') to
277- run patch-update with the --make option (which opens a shell on error)
278269""" )
279270 ans = input ("<Press Enter OR 'y' to continue> " )
280271
@@ -289,29 +280,17 @@ About to:
289280 if s .returncode :
290281 die ('Aborting' )
291282
292- print ('Updating files in "patches" dir ...' )
293- s = cmd_run (f'packaging/patch-update --branch={ args .master_branch } ' )
294- if s .returncode :
295- die ('Aborting' )
296-
297283 if re .match (r'^y' , ans , re .I ):
298284 print (f'\n Running smart-make on all "patch/{ args .master_branch } /*" branches ...' )
299285 cmd_run (f"packaging/patch-update --branch={ args .master_branch } --skip-check --make" )
300286
301- if os .path .isdir ('patches/.git' ):
302- s = cmd_run (f"cd patches && git commit -a -m 'The patches for { version } .'" )
303- if s .returncode :
304- die ('Aborting' )
305-
306287 print (f"""\
307288{ dash_line }
308289
309290About to:
310291 - create signed tag for this release: { v_ver }
311292 - create release diffs, "{ diff_name } "
312293 - create release tar, "{ srctar_name } "
313- - generate { rsync_ver } /patches/* files
314- - create patches tar, "{ pattar_name } "
315294 - update top-level README.md, NEWS.md, TODO, and ChangeLog
316295 - update top-level rsync*.html manpages
317296 - gpg-sign the release files
@@ -327,12 +306,6 @@ About to:
327306 if 'bad passphrase' in out or 'failed' in out :
328307 die ('Aborting' )
329308
330- if os .path .isdir ('patches/.git' ):
331- out = cmd_txt (f"cd patches && git tag -s -m 'Version { version } .' { v_ver } " , capture = 'combined' ).out
332- print (out , end = '' )
333- if 'bad passphrase' in out or 'failed' in out :
334- die ('Aborting' )
335-
336309 os .environ ['PATH' ] = ORIGINAL_PATH
337310
338311 # Extract the generated files from the old tar.
@@ -354,15 +327,6 @@ About to:
354327 cmd_chk (['fakeroot' , 'tar' , 'czf' , srctar_file , '--exclude=.github' , rsync_ver ])
355328 shutil .rmtree (rsync_ver )
356329
357- print (f'Updating files in "{ rsync_ver } /patches" dir ...' )
358- os .mkdir (rsync_ver , 0o755 )
359- os .mkdir (f"{ rsync_ver } /patches" , 0o755 )
360- cmd_chk (f"packaging/patch-update --skip-check --branch={ args .master_branch } --gen={ rsync_ver } /patches" .split ())
361-
362- print (f"Creating { pattar_file } ..." )
363- cmd_chk (['fakeroot' , 'tar' , 'chzf' , pattar_file , rsync_ver + '/patches' ])
364- shutil .rmtree (rsync_ver )
365-
366330 print (f"Updating the other files in { dest } ..." )
367331 md_files = 'README.md NEWS.md INSTALL.md' .split ()
368332 html_files = [ fn for fn in gen_pathnames if fn .endswith ('.html' ) ]
0 commit comments