[Checkins] SVN: zc.recipe.rhrc/trunk/src/zc/recipe/rhrc/ Fixed a bug in the uninstall script. If the deployment is set, use

[Jim Fulton]

Log message for revision 71464:
  Fixed a bug in the uninstall script.  If the deployment is set, use
  that as the script name.
  

Changed:
  U   zc.recipe.rhrc/trunk/src/zc/recipe/rhrc/README.txt
  U   zc.recipe.rhrc/trunk/src/zc/recipe/rhrc/__init__.py

-=-
Modified: zc.recipe.rhrc/trunk/src/zc/recipe/rhrc/README.txt
===================================================================
--- zc.recipe.rhrc/trunk/src/zc/recipe/rhrc/README.txt	2006-12-06 19:28:32 UTC (rev 71463)
+++ zc.recipe.rhrc/trunk/src/zc/recipe/rhrc/README.txt	2006-12-06 19:37:32 UTC (rev 71464)
@@ -526,10 +526,6 @@
     buildout: Installing zoperc
     --add acme
 
-XXX of course, there is a problem here.  We really should run
-chkconfig --del on the old rc script, ut we would need uninstall
-recipes and zc.buildout doesn't support those yet.
-
     >>> ls(demo)
     -  acme
     -  acme-instance1
@@ -584,3 +580,18 @@
         ;;
     esac
     <BLANKLINE>
+
+
+.. 
+
+  Edge case, when we remove the part, we uninstall acme:
+
+    >>> write('buildout.cfg',
+    ... """
+    ... [buildout]
+    ... parts =
+    ... """)
+    >>> print system('bin/buildout'),
+    buildout: Uninstalling zoperc
+    buildout: Running uninstall recipe
+    --del acme

Modified: zc.recipe.rhrc/trunk/src/zc/recipe/rhrc/__init__.py
===================================================================
--- zc.recipe.rhrc/trunk/src/zc/recipe/rhrc/__init__.py	2006-12-06 19:28:32 UTC (rev 71463)
+++ zc.recipe.rhrc/trunk/src/zc/recipe/rhrc/__init__.py	2006-12-06 19:37:32 UTC (rev 71464)
@@ -117,6 +117,7 @@
         pass
 
 def uninstall(name, options):
+    name = options.get('deployment', name)
     if options.get('chkconfig'):
         chkconfigcommand = options.get('chkconfigcommand', 'chkconfig')
         os.system(chkconfigcommand+' --del '+name)