From f8eca49a51c1c3c8803c272d69182e0f7c7e3365 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Mon, 17 Jul 2006 02:53:50 +0000
Subject: Change patch to be bcfg2- package

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1960 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/patches/usr-local.diff | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'encap/patches')

diff --git a/encap/patches/usr-local.diff b/encap/patches/usr-local.diff
index 969841d0f..2110ccf6f 100644
--- a/encap/patches/usr-local.diff
+++ b/encap/patches/usr-local.diff
@@ -1,16 +1,3 @@
-Index: encap/bcfg2-0.8.2pre10.profile
-===================================================================
---- encap/bcfg2-0.8.2pre10.profile	(revision 1958)
-+++ encap/bcfg2-0.8.2pre10.profile	(working copy)
-@@ -57,7 +57,7 @@
- />
- 
- <patch
--url="http://trac.mcs.anl.gov/projects/bcfg2/browser/trunk/bcfg2/encap/patches/usr-local.diff?rev=1956&amp;format=raw"
-+url="http://trac.mcs.anl.gov/projects/bcfg2/browser/trunk/bcfg2/encap/patches/usr-local.diff?rev=1959&amp;format=raw"
- options="-p0"
- />
- 
 Index: src/lib/Options.py
 ===================================================================
 --- src/lib/Options.py	(revision 1957)
@@ -33,7 +20,7 @@ Index: src/lib/Server/Plugins/Cfg.py
                  dfile.write(delta.data)
                  dfile.close()
 -                ret = os.system("patch -uf %s < %s > /dev/null 2>&1"%(basefile.name, dfile.name))
-+                ret = os.system("/usr/local/bin/patch -uf %s < %s > /dev/null 2>&1"%(basefile.name, dfile.name))
++                ret = os.system("/usr/local/bin/b2patch -uf %s < %s > /dev/null 2>&1"%(basefile.name, dfile.name))
                  output = open(basefile.name, 'r').read()
                  [os.unlink(fname) for fname in [basefile.name, dfile.name]]
                  if ret >> 8 != 0:
-- 
cgit v1.2.3-1-g7c22