Changeset 299

Timestamp:

02/10/2007 08:06:09 PM

Author:

luedi

Message:

_get_valid_path can be called without a version number. Protect unitialized value warnings.

Files:

• trunk/script/Vss2Svn/ActionHandler.pm (modified) (2 diffs)

trunk/script/Vss2Svn/ActionHandler.pm

@@ -1132 +1132 @@
-    my($self, $physname, $parentphys, $version) = @_;
-    
+    my $physinfo = $gPhysInfo{$physname};
+    if (!defined $physinfo) {
+        return undef;
+    }
+
+    if (!defined $version) {
+        $version = $physinfo->{last_version};
+    }
+
-    # 0.) If the version we are looking for is prior to the first version of this
-    #     item (e.g in a branch / Pin situation), we need to check the ancestor
-    my $physinfo = $gPhysInfo{$physname};
-    if (defined $physinfo &&
-        $version < $physinfo->{first_version}) {
@@ -1165 +1173 @@
-        return undef;
-    }
-
-    if (!defined $version) {
-        $version = $physinfo->{last_version};
-    }
-    
-    # 1. check the parent requested, if there was an item name for this version
-    #    we can use this item name, since it was valid in that time