Changeset 10606 for trunk/Padre/lib/Padre/Wx/Main.pm

Timestamp:

02/07/10 11:19:10 (2 years ago)

Author:

kthakore

Message:

Add a fix for ticket #845. The problem was that when padre is called like so 'padre somedir/file.pl'. The resulting Document object had filename = somedir/file.pl and projectdir = somdir. So when we try to run the code the command created chdir in get_command once to projectdir and then tries to run somedir/file.pl. So it crashes by try to chdir twice in somedir then run file. To fix this I made it check before chdir to see if the somedir exists. Then I also see if Document->{filename} has a \|\/\ in it and if it does split and take the last element.

File:

• trunk/Padre/lib/Padre/Wx/Main.pm (modified) (2 diffs)

trunk/Padre/lib/Padre/Wx/Main.pm

@@ -2390 +2390 @@
             SCOPE: {
                 require File::pushd;
-                my $pushd = File::pushd::pushd( $document->project_dir );
+                # Ticket #845 this project_dir is created in correctly when you do padre somedir/script.pl and run F5 on that
+                # real stupid think so we don't crash
+                # to fix this $document->get_command needs to recognize which folder it is in
+                # The other part of this fix is in lib/Padre/Document/Perl.pm in get_command
+                # Please feel free to fix this
+                my $pushd = File::pushd::pushd( $document->project_dir) if -e $document->project_dir;
                 $self->run_command($cmd);
             }
@@ -2404 +2409 @@
                 SCOPE: {
                     require File::pushd;
-                    my $pushd = File::pushd::pushd( $document->project_dir );
+                    my $pushd = File::pushd::pushd( $document->project_dir ) if -e  $document->project_dir;
                     $self->run_command($cmd);
                 }