Changeset 2086 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder

Timestamp:

Apr 29, 2016, 6:11:26 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Updates COPYINg files for new FSF address
• Improve pbr support

File:

• devel/pb-modules/lib/ProjectBuilder/VCS.pm (modified) (1 diff)

devel/pb-modules/lib/ProjectBuilder/VCS.pm

@@ -208 +208 @@
             my ($pbpbr) = pb_conf_get_if("pbpbr");
             if ((defined $pbpbr) && (defined $pbpbr->{$ENV{'PBPROJ'}})) {
-                # The project use pbr so benefit from it to export data
-                pb_system("cd $source ; mkdir $tmp ; python setup.py sdist --keep-temp --dist-dir $tmp ; cd $tmp ; file=`ls *.tar.gz` ; tar xfz \$file ; dir=`tar tvfz \$file | head -1 | awk '{print \$6}'` ; if [ ! -d \$dir ] || [ \$dir = / ]; then exit -1 ; fi ; mv \$dir/* \$dir/.??* . ; rmdir \$dir ; rm -f \$file ; ls -al ","Exporting current $source from GIT with pbr to $tmp ");
+                # The project uses pbr so benefit from it to export data
+                pb_system("cd $source ; mkdir $tmp ; python setup.py sdist --keep-temp --dist-dir $tmp ; cd $tmp ; file=`ls *.tar.gz` ;  if [ _\$file = _ ] || [ ! -f \$file ]; then exit -1; fi; tar xfz \$file ; dir=`tar tvfz \$file | head -1 | awk '{print \$6}'` ; if [ ! -d \$dir ] || [ _\$dir = _ ] || [ \$dir = / ]; then exit -1 ; fi ; mv \$dir/* \$dir/.??* . ; rmdir \$dir ; rm -f \$file ; ls -al ","Exporting current $source from GIT with pbr to $tmp ");
             } else {
                 # no pbr do it ourselves