[svk-commit] r2939 - trunk/lib/SVK/Command

[nobody at bestpractical.com]

Author: clsung
Date: Sat Jun 28 22:07:57 2008
New Revision: 2939

Modified:
   trunk/lib/SVK/Command/Branch.pm

Log:
- fix svk br --setup  failed problem

Reported by: nothingmuch (freenode at irc)

Modified: trunk/lib/SVK/Command/Branch.pm
==============================================================================
--- trunk/lib/SVK/Command/Branch.pm	(original)
+++ trunk/lib/SVK/Command/Branch.pm	Sat Jun 28 22:07:57 2008
@@ -808,7 +808,7 @@
 	    "svk:project:$project_name:path-trunk" => $trunk_path,
 	    "svk:project:$project_name:path-branches" => $branch_path,
 	    "svk:project:$project_name:path-tags" => $tag_path);
-	if ($ret) { # we have problem to write to remote
+	if ($ret or $@) { # we have problem to write to remote
 	    if ($source_root ne $url) {
 		$logger->info( loc("Can't write project props to remote root. Save in local instead."));
 	    } else {
@@ -819,7 +819,7 @@
 	    $self->do_propset("svk:project:$project_name:path-tags",$tag_path, $local_root);
 	    $self->do_propset("svk:project:$project_name:root",$preceding_path, $local_root);
 	}
-	$proj = SVK::Project->create_from_prop($target);
+	$proj = SVK::Project->create_from_prop($target,$project_name);
 	# XXX: what if it still failed here? How to rollback the prop commits?
 	if (!$proj) {
 	    $logger->info( loc("Project setup failed.\n"));