[csw-devel] SF.net SVN: opencsw:[620] buildfarm/bin

[dmichelsen at users.sourceforge.net]

Revision: 620
          http://opencsw.svn.sourceforge.net/opencsw/?rev=620&view=rev
Author:   dmichelsen
Date:     2012-05-29 22:33:04 +0000 (Tue, 29 May 2012)
Log Message:
-----------
generate-catalog: Updates, using the new catalog generator

Modified Paths:
--------------
    buildfarm/bin/generate-catalog
    buildfarm/bin/generate-unstable

Modified: buildfarm/bin/generate-catalog
===================================================================
--- buildfarm/bin/generate-catalog	2012-05-23 16:47:24 UTC (rev 619)
+++ buildfarm/bin/generate-catalog	2012-05-29 22:33:04 UTC (rev 620)
@@ -17,11 +17,6 @@
 readonly _URL
 
 # bldcat prints a lot of output
-if ! bldcat --fast --param=timestamp . >/dev/null
-then
-    echo "bldcat failed in $(pwd)."
-    false
-fi
 if chkcat -e catalog
 then
     echo chkcat returned no errors

Modified: buildfarm/bin/generate-unstable
===================================================================
--- buildfarm/bin/generate-unstable	2012-05-23 16:47:24 UTC (rev 619)
+++ buildfarm/bin/generate-unstable	2012-05-29 22:33:04 UTC (rev 620)
@@ -12,13 +12,16 @@
 set -x
 
 declare -r catalogs=( "unstable" "dublin" )
+# declare -r catalogs=( "dublin" )
 declare -r os_rels=( "5.8" "5.9" "5.10" "5.11" )
+# declare -r os_rels=( "5.9" "5.10" "5.11" )
 declare -r mirror_name="opencsw-official"
 declare -r mirror_root="/home/mirror/${mirror_name}"
 
 for catalog in "${catalogs[@]}"
 do
   /home/web/bin/gar/bin/pkgdb \
+      --debug \
       gen-cat --catalog-release "${catalog}" \
       ${mirror_root}/allpkgs \
       ${mirror_root}
@@ -30,7 +33,16 @@
     for osrel in "${os_rels[@]}"; do
     	mkdir -p "${osrel}"
       pushd "${osrel}"
-      /home/web/bin/generate-catalog "${mirror_name}/${catalog}/${arch}/${osrel}"
+      cat_3="${catalog}/${arch}/${osrel}"
+      cat_dir="${mirror_name}/${cat_3}"
+      abs_cat_dir="${mirror_root}/${cat_3}"
+      grm -vf "${abs_cat_dir}/catalog"* "${abs_cat_dir}/descriptions"*
+      /home/web/bin/gar/lib/python/generate_catalog_file.py \
+        --catalog-release ${catalog} \
+        --arch ${arch} \
+        --os-release SunOS${osrel} \
+        --out-dir "${abs_cat_dir}"
+      /home/web/bin/generate-catalog "${cat_dir}"
       popd
     done
     popd

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.