Changeset 1596 in ProjectBuilder for devel/pb

Timestamp:

May 25, 2012, 12:52:34 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Improve system cmd display in Distribution.pm for deps analysis
• umount /proc in the VE when using rpmbootstrap, if it wasn't unmounted due to error, to allow snapshots to work correctly
• pbtest should now be able to build afio in an rpm VE (The VE is setup correctly again, including fedora 16 having the requiretty constraint))

File:

• devel/pb/t/pbtest (modified) (3 diffs)

devel/pb/t/pbtest

@@ -220 +220 @@
 filter PBGRP = Applications/Archiving
 filter PBLIC = Afio
+filter PBDEP = gcc
 EOF
 sudocmd "mv /tmp/rpm.pbf $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.pbf"
@@ -234 +235 @@
 perl -pi -e 's|%doc ChangeLog|%doc HISTORY PORTING README SCRIPTS ANNOUNCE-2.5 perl.artistic.license|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
 perl -pi -e 's|%doc INSTALL COPYING README AUTHORS NEWS|%doc afio.lsm script1 script2 script3 script4\n%{_bindir}/%{name}\n%{_mandir}/man1/%{name}.1*|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
+perl -pi -e 's|^#Requires:|Requires:|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
 EOF
 chmod 755 /tmp/pbtestcmd
@@ -308 +310 @@
     # Cleaning VE to use the snapshot
     dd=`echo $d | cut -d'-' -f1`
-    sudocmd "rm -rf $PBTEST/tmp/$dd"
+    vv=`echo $d | cut -d'-' -f2`
+    aa=`echo $d | cut -d'-' -f3`
+    if [ -f $PBTEST/ve/$dd/$vv/$aa/proc/cpuinfo ]; then
+        sudocmd "umount $PBTEST/ve/$dd/$vv/$aa/proc"
+    fi
+    sudocmd "rm -rf $PBTEST/ve/$dd/$vv/$aa"
     sudopbtest "pb -S -m $d sbx2ve"
 done