From 9ddb2e2aa1f9a0c387e1a33b438b0065e7ebe4f9 Mon Sep 17 00:00:00 2001
From: Julian Blake Kongslie <jblake@omgwallhack.org>
Date: Mon, 19 Jul 2010 02:35:27 -0700
Subject: Typo.

---
 usr/src/libpiny/lib/Piny/Repo.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'usr')

diff --git a/usr/src/libpiny/lib/Piny/Repo.pm b/usr/src/libpiny/lib/Piny/Repo.pm
index 05c5793..8b2045c 100644
--- a/usr/src/libpiny/lib/Piny/Repo.pm
+++ b/usr/src/libpiny/lib/Piny/Repo.pm
@@ -197,10 +197,10 @@ sub destroy {
   my $temp = File::Temp->new( ) or die "Could not create temporary file: $!";
   $temp->unlink_on_destroy( 0 );
 
-  $dh = IO::Dir->new( "/etc/cgitrc.d" ) or die "Could not open cgitrc.d directory: $!";
+  my $dh = IO::Dir->new( "/etc/cgitrc.d" ) or die "Could not open cgitrc.d directory: $!";
   while ( defined ( my $entry = $dh->read ) ) {
     next if ( $entry =~ /^\./ );
-    open( FILE, "<", "/etc/cgitrc.d" . $entry ) or die "Could not open cgitrc.d entry $entry: $!";
+    open( FILE, "<", "/etc/cgitrc.d/" . $entry ) or die "Could not open cgitrc.d entry $entry: $!";
     print $temp <FILE>;
     close( FILE ) or die "Could not close cgitrc.d entry $entry: $!";
   };
@@ -230,13 +230,13 @@ sub destroy {
 
   rename( $temp->filename, "/etc/ikiwiki/wikilist" ) or die "Could not rename over old wikilist: $!";
 
-  system( "rm", "-rf", $repo->secure_path, $repo->ikiwiki_destdir, $repo->ikiwiki_srcdir, "/etc/ikiwiki/piny/" . $repo->name . ".setup", $repo->path );
+  system( "rm", "-rf", $s->secure_path, $s->ikiwiki_destdir, $s->ikiwiki_srcdir, "/etc/ikiwiki/piny/" . $s->name . ".setup", $s->path );
 
   my $ikiuser = Piny::User::IkiWiki->new( "name" => "ikiwiki-" . $s->name );
 
   system( "deluser", "--remove-home", $ikiuser->name );
   system( "delgroup", $ikiuser->name );
-  system( "delgroup", "git-" . $repo->name );
+  system( "delgroup", "git-" . $s->name );
 
 };
 
-- 
cgit v1.2.3