New stuff.

[clinton/scripts.git] / freeze

diff --git a/freeze b/freeze
index 5e2ff8b..660619a 100755 (executable)
--- a/freeze
+++ b/freeze
@@ -274,28 +274,32 @@ sub domtool {
 
                for (@domains) {
                        push @{ $$store{$u}{domains} }, $_;
-                       if (!DRY) {
-                               system("domtool-admin rmdom $_")
-                       } else {
-                               warn qq|system("domtool-admin rmdom $_")\n|
-                       }
+
+                       # As per adamc's suggestion, I should not be
+                       # running rmdom explicitly.
+                       # https://bugzilla.hcoop.net/show_bug.cgi?id=555
+                       #if (!DRY) {
+                       #       system("domtool-admin rmdom $_")
+                       #} else {
+                       #       warn qq|system("domtool-admin rmdom $_")\n|
+                       #}
                }
 
-                       if (!DRY) {
-                               system("domtool-rmuser $_")
-                       } else {
-                               warn qq|system("domtool-rmuser $_")\n|
-                       }
+               if (!DRY) {
+                       system("domtool-rmuser $u")
+               } else {
+                       warn qq|system("domtool-rmuser $u")\n|
+               }
 
                push @{ $$store{$u}{modules} }, 'domtool';
        }
 
        elsif ($a =~ /^u/i) {
-                       if (!DRY) {
-                               system("domtool-adduser $_")
-                       } else {
-                               warn qq|system("domtool-adduser $_")\n|
-                       }
+               if (!DRY) {
+                       system("domtool-adduser $u")
+               } else {
+                       warn qq|system("domtool-adduser $u")\n|
+               }
 
                for ( @{ $$store{$u}{domains} } ) {
                        if (!DRY) {