2006-07-21 Jeremy Katz <katzj@redhat.com>

	* scripts/buildinstall: Handle having packages under
	$PRODUCTPATH/RPMS or $PRODUCTPATH/
	* scripts/pkgorder: Likewise.
	* scripts/splittree.py: Likewise.

3 files changed, 28 insertions, 18 deletions

diff --git a/scripts/buildinstall b/scripts/buildinstall
index 5f9425286..e111f8791 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -51,9 +51,6 @@ while [ $# -gt 0 ]; do
 	    shift; shift
 	    ;;
 	*)
-	    if [ -n "$DIR" -o ! -d $1/$PRODUCTPATH/RPMS ]; then
-		usage
-	    fi
 	    DIR=$1
 	    shift
 	    ;;
@@ -85,6 +82,11 @@ if [ -z "$BUGURL" ]; then
 fi
 
 p=`cd $DIR; /bin/pwd`
+if [ -d $DIR/$PRODUCTPATH/RPMS ]; then
+    PKGDIR=$p/$PRODUCTPATH/RPMS
+else
+    PKGDIR=$p/$PRODUCTPATH
+fi
 
 if [ -z "$BUILDINSTDIR" ]; then
     BUILDINSTDIR=$p/buildinstall.tree.$$
@@ -98,12 +100,12 @@ MK_IMAGES=$BUILDINSTDIR/mk-images
 MK_STAMP=$BUILDINSTDIR/makestamp.py
 BUILDINSTALL=$BUILDINSTDIR/buildinstall
 
-BUILDARCH=`rpm -qp --qf "%{ARCH}" $p/$PRODUCTPATH/RPMS/anaconda-runtime-[0-9]*`
+BUILDARCH=`rpm -qp --qf "%{ARCH}" $PKGDIR/anaconda-runtime-[0-9]*`
 
 echo "Running buildinstall..."
 
 pushd $BUILDINSTDIR
-rpm2cpio $p/$PRODUCTPATH/RPMS/anaconda-runtime-[0-9]* | cpio --quiet -iumd './usr*'
+rpm2cpio $PKGDIR/anaconda-runtime-[0-9]* | cpio --quiet -iumd './usr*'
 popd
 
 UPD_INSTROOT=./upd-instroot
@@ -125,7 +127,7 @@ MK_STAMP=$BUILDINSTDIR/makestamp.py
 BUILDINSTALL=$BUILDINSTDIR/buildinstall
 
 echo "Building images..."
-$UPD_INSTROOT $DEBUGSTR $p/$PRODUCTPATH/RPMS $TREEDIR/image-template $TREEDIR/instimage
+$UPD_INSTROOT $DEBUGSTR $PKGDIR $TREEDIR/image-template $TREEDIR/instimage
 
 echo "Creating repository metadata..."
 createrepo -g $PRODUCTPATH/base/comps.xml -q $p
@@ -137,9 +139,9 @@ if [ -n "$PKGORDER" ]; then
 fi
 
 echo "Making images..."
-$MK_IMAGES $DEBUGSTR $p/$PRODUCTPATH/RPMS $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL"
+$MK_IMAGES $DEBUGSTR $PKGDIR $p $TREEDIR/image-template $TREEDIR/instimage $BUILDARCH "$PRODUCTSTR" $VERSION $PRODUCTPATH "$BUGURL"
 
 echo "Writing .discinfo file"
-$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="$DISCSTR" --baseDir=$PRODUCTPATH/base --packagesDir=$PRODUCTPATH/RPMS --pixmapsDir=$PRODUCTPATH/pixmaps --outfile=$p/.discinfo
+$MK_STAMP --releasestr="$RELEASESTR" --arch=$BUILDARCH --discNum="$DISCSTR" --baseDir=$PRODUCTPATH/base --packagesDir=$PKGDIR --pixmapsDir=$PRODUCTPATH/pixmaps --outfile=$p/.discinfo
 
 rm -rf $TREEDIR/image-template $TREEDIR/instimage $BUILDINSTDIR
diff --git a/scripts/pkgorder b/scripts/pkgorder
index 4dd59933c..96f492144 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -140,7 +140,10 @@ if __name__ == "__main__":
         arch = "i686"
 
     # print out kernel related packages first
-    printMatchingPkgs("%s/%s/RPMS/%s" % (toppath, product, "kernel-*"))
+    if os.path.isdir("%s/%s/RPMS"):
+        printMatchingPkgs("%s/%s/RPMS/%s" % (toppath, product, "kernel-*"))
+    else:
+        printMatchingPkgs("%s/%s/%s" % (toppath, product, "kernel-*"))
 
     testpath = "/tmp/pkgorder-%d" %(os.getpid(),)
     os.system("mkdir -p %s/var/lib/rpm" %(testpath,))
diff --git a/scripts/splittree.py b/scripts/splittree.py
index 04282cdfc..9e8c0bd34 100644
--- a/scripts/splittree.py
+++ b/scripts/splittree.py
@@ -249,14 +249,19 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
         """Creates links in the split dirs for the RPMs"""
         
         packages = {}
-                
-        rpmlist = os.listdir("%s/%s/RPMS" % (self.dist_dir, self.product_path))
+
+        if os.path.isdir("%s/%s/RPMS" %(self.dist_dir, self.product_path)):
+            pkgdir = "%s/RPMS" %(self.product_path, )
+        else:
+            pkgdir = "%s" %(self.product_path,)
+            
+        rpmlist = os.listdir("%s/%s" %(self.dist_dir, pkgdir))
         rpmlist.sort()
 
         # create the packages dictionary in this format: n-v-r.a:['n-v-r.arch.rpm']
         for filename in rpmlist:
-            filesize = os.path.getsize("%s/%s/RPMS/%s" % (self.dist_dir, self.product_path, filename))
-            pkg_nvr = nvra("%s/%s/RPMS/%s" %(self.dist_dir, self.product_path, filename))
+            filesize = os.path.getsize("%s/%s/%s" % (self.dist_dir, pkgdir, filename))
+            pkg_nvr = nvra("%s/%s/%s" %(self.dist_dir, pkgdir, filename))
             
             if packages.has_key(pkg_nvr):
                 # append in case we have multiple packages with the
@@ -291,7 +296,7 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
                 continue
             for file_name in packages[rpm_nvr]:
                 curused = self.getSize("%s-disc%s" % (self.dist_dir, disc), blocksize=1)
-                filesize = self.getSize("%s/%s/RPMS/%s" % (self.dist_dir, self.product_path, file_name), blocksize=1)
+                filesize = self.getSize("%s/%s/%s" % (self.dist_dir, pkgdir, file_name), blocksize=1)
                 newsize = filesize + curused
 
                 # compensate for the size of the comps package which has yet to be created
@@ -312,8 +317,8 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
                     try:
                         nextdisc=self.bin_list.index(disc+1)
                         disc = self.bin_list[nextdisc]
-                        os.link("%s/%s/RPMS/%s" % (self.dist_dir, self.product_path, file_name),
-                                "%s-disc%d/%s/RPMS/%s" % (self.dist_dir, disc, self.product_path, file_name))
+                        os.link("%s/%s/%s" % (self.dist_dir, pkgdir, file_name),
+                                "%s-disc%d/%s/%s" % (self.dist_dir, disc, pkgdir, file_name))
                         packagenum = 1
                         firstpackage = file_name
                         
@@ -324,8 +329,8 @@ self.reserve_size : Additional size needed to be reserved on the first disc.
                         continue
                     
                 else:
-                    os.link("%s/%s/RPMS/%s" % (self.dist_dir, self.product_path, file_name),
-                            "%s-disc%d/%s/RPMS/%s" % (self.dist_dir, disc, self.product_path, file_name))
+                    os.link("%s/%s/%s" % (self.dist_dir, pkgdir, file_name),
+                            "%s-disc%d/%s/%s" % (self.dist_dir, disc, pkgdir, file_name))
                     lastpackage = file_name
 
         if reportSize == 1: