[Cvs-syncmail] syncmail syncmail,1.36.2.19,1.36.2.20

[Fred L. D. Jr. <fd...@us...>]

Update of /cvsroot/cvs-syncmail/syncmail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8531

Modified Files:
      Tag: new-config-branch
	syncmail 
Log Message:
drop direct use of rcsdiff; this doesn't work so well


Index: syncmail
===================================================================
RCS file: /cvsroot/cvs-syncmail/syncmail/syncmail,v
retrieving revision 1.36.2.19
retrieving revision 1.36.2.20
diff -u -d -r1.36.2.19 -r1.36.2.20
--- syncmail	19 Apr 2004 17:58:10 -0000	1.36.2.19
+++ syncmail	12 Oct 2004 18:54:27 -0000	1.36.2.20
@@ -219,9 +219,8 @@
             difftype = "-C %d" % config.contextlines
         else:
             difftype = "-u"
-        rcsfile = get_rcs_file(config, file)
-        diffcmd = "/usr/bin/rcsdiff -kk %s --minimal -r %s -r %s %s" \
-                  % (difftype, oldrev, newrev, filestr(rcsfile))
+        diffcmd = "/usr/bin/cvs -f diff -kk %s --minimal -r %s -r %s %s" \
+                  % (difftype, oldrev, newrev, filestr(file))
         fp = os.popen(diffcmd)
         lines = fp.readlines()
         # ignore the error code, it always seems to be 1 :(
@@ -247,12 +246,6 @@
         # quote it with single-quotes.
         return "'%s'" % file
 
-def get_rcs_file(config, file):
-    fn = os.path.join(config.repodir, file)
-    if not os.path.isfile(fn):
-        fn = os.path.join(config.repodir, "Attic", file)
-    return fn
-
 
 
 rfc822_specials_re = re.compile(r'[\(\)\<\>\@\,\;\:\\\"\.\[\]]')