Changeset 886 in MondoRescue for branches

Timestamp:

Oct 8, 2006, 3:10:04 PM (18 years ago)

Author:

Bruno Cornec

Message:

Again a small bug in build process

File:

• branches/2.2.0/tools/build2pkg (modified) (2 diffs)

branches/2.2.0/tools/build2pkg

@@ -63 +63 @@
             ar=$ARCH
         fi
-        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
-        #rm -f $pkg1
-
-        pkg="$pkg $pkg1"
 
         log=$MONDOTMP/$p-rpm.log
@@ -87 +83 @@
             status=-1
         else
+            export pkg1="`egrep '^Wrote:' $log | cut -d: -f2`"
             if [ -f /usr/bin/rpmlint ]; then
-                /usr/bin/rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
+                /usr/bin/rpmlint $pkg1
             else
                 echo "No rpmlint found, please install it"
             fi
+            export pkg="$pkg `ls $pkg1 | grep -v src.rpm`"
         fi
         rm -rf ${TOPBUILDDIR}/BUILD/*