Author: kwright
Date: Sun Dec 4 20:48:18 2022
New Revision: 1905741
URL: http://svn.apache.org/viewvc?rev=1905741&view=rev
Log:
Update release script to Python 3
Modified:
manifoldcf/site/trunk/scripts/update-site.py
Modified: manifoldcf/site/trunk/scripts/update-site.py
URL:
http://svn.apache.org/viewvc/manifoldcf/site/trunk/scripts/update-site.py?rev=1905741&r1=1905740&r2=1905741&view=diff
==============================================================================
--- manifoldcf/site/trunk/scripts/update-site.py (original)
+++ manifoldcf/site/trunk/scripts/update-site.py Sun Dec 4 20:48:18 2022
@@ -19,7 +19,7 @@ def site_merge(source_dir, target_dir):
"""
# First, handle deletes. Go through the target tree and find everything
that doesn't
# exist in the source...
- print >> sys.stderr, "Removing obsolete directories and files..."
+ print("Removing obsolete directories and files...")
deleted_dirs = { }
for root, dirs, files in os.walk(target_dir):
if root.find(".svn") == -1:
@@ -27,7 +27,7 @@ def site_merge(source_dir, target_dir):
relative_root = root[len(target_dir):]
if len(relative_root) > 0 and (relative_root[0] == "/" or
relative_root[0] == "\\"):
relative_root = relative_root[1:]
- if not deleted_dirs.has_key(relative_root):
+ if not relative_root in deleted_dirs:
# Remove any dirs that have gone away
for dir in dirs:
if dir != ".svn":
@@ -36,7 +36,7 @@ def site_merge(source_dir, target_dir):
source_dirname = os.path.join(source_dir,
relative_dirname)
if os.path.exists(target_dirname):
if not os.path.exists(source_dirname):
- print >> sys.stderr, "Deleting directory %s" %
relative_dirname
+ print("Deleting directory %s" %
relative_dirname)
svn_command(["remove",target_dirname])
deleted_dirs[relative_dirname] = True
# Process files now.
@@ -46,12 +46,12 @@ def site_merge(source_dir, target_dir):
source_filename = os.path.join(source_dir,
relative_filename)
if os.path.exists(target_filename):
if not os.path.exists(source_filename):
- print >> sys.stderr, "Deleting file %s" %
relative_filename
+ print("Deleting file %s" % relative_filename)
svn_command(["remove",target_filename])
# Now, we do the same thing for the source tree. We will add the missing
directories and
# copy and add the files.
- print >> sys.stderr, "Adding and updating new directories and files..."
+ print("Adding and updating new directories and files...")
for root, dirs, files in os.walk(source_dir):
relative_root = root[len(source_dir):]
if len(relative_root) > 0 and (relative_root[0] == "/" or
relative_root[0] == "\\"):
@@ -70,7 +70,7 @@ def site_merge(source_dir, target_dir):
except:
pass
if succeeded:
- print >> sys.stderr, "Adding directory %s" % relative_dirname
+ print("Adding directory %s" % relative_dirname)
for file in files:
relative_filename = os.path.join(relative_root, file)
target_filename = os.path.join(target_dir, relative_filename)
@@ -79,12 +79,12 @@ def site_merge(source_dir, target_dir):
shutil.copyfile(source_filename, target_filename)
svn_result = svn_command(["status",target_filename])
if len(svn_result) > 0 and svn_result[0] == "?":
- print >> sys.stderr, "Adding file %s" % relative_filename
+ print("Adding file %s" % relative_filename, sys.stderr)
svn_command(["add",target_filename])
if __name__ == '__main__':
if len(sys.argv) != 2 and len(sys.argv) != 3:
- print >> sys.stderr, "Usage: %s <src_dir> [<target_dir>]" % sys.argv[0]
+ print( "Usage: %s <src_dir> [<target_dir>]" % sys.argv[0])
sys.exit(1)
source_dir = sys.argv[1]
@@ -97,8 +97,8 @@ if __name__ == '__main__':
site_merge(source_dir, target_dir)
- print >> sys.stderr, "Committing changes..."
+ print("Committing changes...")
svn_command([ "-m", "Update ManifoldCF site", "commit", target_dir])
- print >> sys.stderr, "Site updated!"
+ print("Site updated!")
\ No newline at end of file
