Changeset 2365 in ProjectBuilder

Timestamp:

Feb 26, 2019, 1:37:40 AM (6 years ago)

Author:

Bruno Cornec

Message:

Fix ECDSA lack of support for RHEL7 and avoid : in release tags

Files:

• 0.14.6/pb/bin/pb (modified) (1 diff)
• devel/pb/bin/pb (modified) (3 diffs)

0.14.6/pb/bin/pb

@@ -4697 +4697 @@
 
 # We still favour RSA and fall back to ECDSA if not available
-$keyfile = "$ENV{'HOME'}/.ssh/id_rsa" if (-s "$ENV{'HOME'}/.ssh/id_rsa");
+#$keyfile = "$ENV{'HOME'}/.ssh/id_rsa" if (-s "$ENV{'HOME'}/.ssh/id_rsa");
 if ($rsa != 0) {
     # And we favour a specific key over a generic one except if in delivery to ftp server

devel/pb/bin/pb

@@ -1243 +1243 @@
         }
 
+        if (($pbtag =~ /:/) && ($scheme =~ /svn/)) {
+            die "RPM doesn't support release tag with ':'. Try to svn up before running pb";
+        }
+
         pb_log(0,"\n");
         pb_log(0,"Management of $pbpkg $pbver-$pbtag\n");
@@ -4816 +4820 @@
 }
 
-# Some ECDSA implementation are not working correctly e.g. RHEL7, Fedora 20/21
 if (!(-e "$ENV{'HOME'}/.ssh/pb_rsa") && ($create eq 1)) {
     pb_system("ssh-keygen -q -b 2048 -N '' -f $ENV{'HOME'}/.ssh/pb_rsa -t rsa","Generating RSA SSH keys for pb");
@@ -4822 +4825 @@
 
 # We still favour RSA and fall back to ECDSA if not available
-$keyfile = "$ENV{'HOME'}/.ssh/id_rsa" if (-s "$ENV{'HOME'}/.ssh/id_rsa");
+# Some ECDSA implementation are not working correctly e.g. RHEL7, Fedora 20/21
+#$keyfile = "$ENV{'HOME'}/.ssh/pb_rsa" if (-s "$ENV{'HOME'}/.ssh/pb_rsa");
 if ($rsa != 0) {
     # And we favour a specific key over a generic one except if in delivery to ftp server