[omd-commits] OMD Git: omd: omd: hard code path to patch

git version control git at mathias-kettner.de
Sun May 8 13:43:47 CEST 2011


Module:   omd
Branch:   master
Commit:   2024b66db8415c907df9413edab9c067cdb39897
URL:      http://omdistro.org/projects/omd/repository/revisions/2024b66db8415c907df9413edab9c067cdb39897

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Sun May  8 13:43:43 2011 +0200
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Sun May  8 13:43:43 2011 +0200

omd: hard code path to patch

---

 packages/omd/omd |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/omd/omd b/packages/omd/omd
index 8119e05..21c300e 100644
--- a/packages/omd/omd
+++ b/packages/omd/omd
@@ -740,8 +740,8 @@ def patch_template_file(src, dst, old, new):
     # Now create a patch from old to new and immediately apply on
     # existing - possibly user modified - file.
     
-    if 0 == os.system("diff -u %s %s | patch --force --backup --forward --silent %s" %
-            (old_orig_path, new_orig_path, dst)):
+    if 0 == os.system("diff -u %s %s | %s/bin/patch --force --backup --forward --silent %s" %
+            (old_orig_path, new_orig_path, site_dir(new), dst)):
         sys.stdout.write(good + " Converted      %s\n" % src)
     else:
         # Make conflict resolution interactive - similar to omd update
@@ -1999,12 +1999,12 @@ def main_mv_or_cp(what, args, options={}):
         os.system("rsync -arx %s '%s/' '%s/'" % 
                 (addopts, site_dir(g_sitename), site_dir(new)))
 
-    # Change config files from old to new site (see rename_site())
-    patch_skeleton_files(g_sitename, new)
-
     # give new user all files
     chown_tree(site_dir(new), new)
 
+    # Change config files from old to new site (see rename_site())
+    patch_skeleton_files(g_sitename, new)
+
     # In case of mv now delete old user
     if what == "mv":
         userdel(old)



More information about the omd-commits mailing list