Changeset 1459 in ProjectBuilder

Timestamp:

Apr 6, 2012, 2:47:21 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix an error with extdir attribute management when dealing with non-test version (an additionl space was generated, which is now suppressed)

File:

• devel/pb/bin/pb (modified) (4 diffs)

devel/pb/bin/pb

@@ -1251 +1251 @@
 
         my $vertag = $pkg->{$pbpkg};
+        pb_log(2,"Vertag: $vertag\n");
         # get the version of the current package - maybe different
         ($pbver,$pbtag) = split(/-/,$vertag);
@@ -1679 +1680 @@
             my $vertag = $pkg->{$pbpkg};
             # get the version of the current package - maybe different
+            pb_log(2,"Vertag: $vertag\n");
             ($pbver,$pbtag) = split(/-/,$vertag);
 
@@ -3069 +3071 @@
             my $vertag2 = $pkg->{"project-builder"};
             # get the version of the current package - maybe different
+            pb_log(2,"Vertag1: $vertag1\n");
+            pb_log(2,"Vertag2: $vertag2\n");
             my ($pbver1,$tmp1) = split(/-/,$vertag1);
             my ($pbver2,$tmp2) = split(/-/,$vertag2);
@@ -4077 +4081 @@
     foreach my $k (keys %$ed) {
         $pbextdir = $ed->{$k};
-    }
-    pb_log(2,"pbextdir: $pbextdir\n");
+        # In case we have an empty field, empty it completely
+        pb_log(2,"pbextdir: ***$pbextdir***\n");
+        $pbextdir =~ s/^\s*$//;
+    }
+    pb_log(2,"pbextdir: ***$pbextdir***\n");
     return($pbextdir);
 }