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

[dmichelsen at users.sourceforge.net]

Revision: 530
          http://opencsw.svn.sourceforge.net/opencsw/?rev=530&view=rev
Author:   dmichelsen
Date:     2011-09-10 11:50:39 +0000 (Sat, 10 Sep 2011)
Log Message:
-----------
no snapshots on -future, script rename to push-opencsw-to-mirror

Modified Paths:
--------------
    buildfarm/bin/generate-catalog
    buildfarm/bin/opencsw-future-update

Added Paths:
-----------
    buildfarm/bin/push-opencsw-to-mirror

Removed Paths:
-------------
    buildfarm/bin/push-opencsw-future

Modified: buildfarm/bin/generate-catalog
===================================================================
--- buildfarm/bin/generate-catalog	2011-09-10 07:44:58 UTC (rev 529)
+++ buildfarm/bin/generate-catalog	2011-09-10 11:50:39 UTC (rev 530)
@@ -9,11 +9,12 @@
 set -e
 set -x
 
-_cswsign_host=192.168.1.40
-_cswsign_port=9981
-_signtype=clearsign
-_catalog_path=$1
+readonly _cswsign_host=192.168.1.40
+readonly _cswsign_port=9981
+readonly _signtype=clearsign
+readonly _catalog_path=$1
 _URL=http://${_cswsign_host}:${_cswsign_port}/${_signtype}/${_catalog_path}
+readonly _URL
 
 # bldcat prints a lot of output
 if ! bldcat --fast . >/dev/null
@@ -28,7 +29,7 @@
     r="$?"
     if [[ "${r}" -eq 2 ]]; then
         echo -n "chkcat returned an error in $(pwd) "
-        echo "when generating ${catalog}."
+        echo "when generating a catalog."
         false
     fi
 fi

Modified: buildfarm/bin/opencsw-future-update
===================================================================
--- buildfarm/bin/opencsw-future-update	2011-09-10 07:44:58 UTC (rev 529)
+++ buildfarm/bin/opencsw-future-update	2011-09-10 11:50:39 UTC (rev 530)
@@ -12,11 +12,14 @@
 ${BASE_DIR}/sync-checkpkg
 # Current is no longer synced from the official mirror.
 # ${BASE_DIR}/sync-current-in-opencsw-future
-${BASE_DIR}/make-snapshot-README
 
+# <maciej> I'm suspending the snapshots, because they take up space and make
+# pushes slow. Snapshots should be made elsewhere.
+# ${BASE_DIR}/make-snapshot-README
+
 # Generating unstable.
 ${BASE_DIR}/generate-unstable
-${BASE_DIR}/push-opencsw-future
+${BASE_DIR}/push-opencsw-to-mirror
 ${BASE_DIR}/send-catalog-update-notifications
 
 echo "$0 completed successfully"

Deleted: buildfarm/bin/push-opencsw-future
===================================================================
--- buildfarm/bin/push-opencsw-future	2011-09-10 07:44:58 UTC (rev 529)
+++ buildfarm/bin/push-opencsw-future	2011-09-10 11:50:39 UTC (rev 530)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# The official mirror push
-/opt/csw/bin/rsync -raHv --delete-after /export/mirror/opencsw-official/ mirror at rsync.opencsw.org:/csw/rsync/csw/
-
-# The development mirror push
-/opt/csw/bin/rsync -raHv --delete-after /export/mirror/opencsw-future/ mirror at rsync.opencsw.org:/csw/rsync/csw-future/

Copied: buildfarm/bin/push-opencsw-to-mirror (from rev 523, buildfarm/bin/push-opencsw-future)
===================================================================
--- buildfarm/bin/push-opencsw-to-mirror	                        (rev 0)
+++ buildfarm/bin/push-opencsw-to-mirror	2011-09-10 11:50:39 UTC (rev 530)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# The official mirror push
+/opt/csw/bin/rsync -raHv --delete-after /export/mirror/opencsw-official/ mirror at rsync.opencsw.org:/csw/rsync/csw/
+
+# The development mirror push
+/opt/csw/bin/rsync -raHv --delete-after /export/mirror/opencsw-future/ mirror at rsync.opencsw.org:/csw/rsync/csw-future/

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