Changeset 2370 in ProjectBuilder

Timestamp:

Feb 28, 2019, 2:39:10 AM (6 years ago)

Author:

Bruno Cornec

Message:

Fix find + chmod call to always return true so that docker ends without error due to that
Now works with stop-on-errors

File:

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

devel/pb/bin/pb

@@ -2918 +2918 @@
         print DOCKER "  # Cleanup first to avoid rights issues for root owned files e.g.\n";
         print DOCKER "  j=\`basename \$i\`\n";
-        print DOCKER "  rm -f \$TDIR/\$j\n";
+        print DOCKER "  if [ -d \$TDIR/\$j ]; then\n";
+        print DOCKER "    rmdir --ignore-fail-on-non-empty \$TDIR/\$j\n";
+        print DOCKER "  else\n";
+        print DOCKER "    rm -f \$TDIR/\$j\n";
+        print DOCKER "  fi\n";
         print DOCKER "  cp -r \$i \$TDIR\n";
         print DOCKER "done\n";
-        print DOCKER "find \$TDIR -type f -print0 | xargs -0 chmod 644\n";
-        print DOCKER "find \$TDIR -type d -print0 | xargs -0 chmod 777 2> /dev/null\n";
+        print DOCKER "find \$TDIR -type f -print0 | xargs -0 chmod 644 && /bin/true\n";
+        print DOCKER "find \$TDIR -type d -print0 | xargs -0 chmod 777 2> /dev/null && /bin/true\n";
         #print DOCKER "ls -al \$TDIR\n";
         print DOCKER "exit 0\n";
@@ -2949 +2953 @@
         pb_system("$cpcmd $cp2target/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$ 2> /dev/null","Get package names in $cp2target");
         if (not -f "$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") {
-            pb_log(0,"ERROR with VM/RM $v on getting $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$\n");
+            pb_log(0,"ERROR with $v on getting $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$\n");
+            pb_exit(-1);
         } else {
             open(KEEP,"$ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$") || die "Unable to read $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.$$";
@@ -3096 +3101 @@
                                 $all_ok = 0;
                                 pb_log(0,"ERROR: pid $pid failed\n");
+                                pb_log(0,"code: $code - signal: $signal - dump: $dump\n");
                             }
                         });
@@ -3443 +3449 @@
                                 $all_ok = 0;
                                 pb_log(0,"ERROR: pid $pid failed\n");
+                                pb_log(0,"code: $code - signal: $signal - dump: $dump\n");
                             }
                         });