[Zope3-checkins] CVS: Zope3/utilities/fssync - commit.py:1.6
Guido van Rossum
guido@python.org
Mon, 5 May 2003 18:17:40 -0400
Update of /cvs-repository/Zope3/utilities/fssync
In directory cvs.zope.org:/tmp/cvs-serv6573
Modified Files:
commit.py
Log Message:
Fix a bug I introduced when breaking a long line.
=== Zope3/utilities/fssync/commit.py 1.5 => 1.6 ===
--- Zope3/utilities/fssync/commit.py:1.5 Mon May 5 17:53:13 2003
+++ Zope3/utilities/fssync/commit.py Mon May 5 18:17:40 2003
@@ -86,11 +86,11 @@
ob = getObject(zopedb_path, root)
zopedb_temp_file = createTempfile(ob, zopedb_path)
diff_cmd1 = ("diff -q -b %s %s; echo $?" %
- fmt_original_path, zopedb_temp_file)
+ (fmt_original_path, zopedb_temp_file))
diff_res1 = commands.getoutput(diff_cmd1)
isConflict = int(diff_res1[-1])
diff_cmd2 = ("diff -q -b %s %s; echo $?" %
- fmt_sandbox_path, fmt_original_path)
+ (fmt_sandbox_path, fmt_original_path))
diff_res2 = commands.getoutput(diff_cmd2)
isCommitRequired = int(diff_res2[-1])