[planet-web/solar: 1318/1318] Use venus from our own solar system

[Andy Wingo <apwingo src gnome org>]

commit 2f69baae8ed9f3635e6deeb637fc6a5a78442438
Author: Andy Wingo <wingo pobox com>
Date:   Wed May 16 18:11:44 2012 +0200

    Use venus from our own solar system
    
    * update-planet: Use the copy of venus from the planet-web repo instead
      of fetching from github.
    
    * HACKING: Update.

 HACKING       |   34 ++++++++++++++++++++++++++++++++++
 update-planet |   10 ++--------
 2 files changed, 36 insertions(+), 8 deletions(-)
---
diff --git a/HACKING b/HACKING
index 0b09f5d..3b4a73d 100644
--- a/HACKING
+++ b/HACKING
@@ -1,3 +1,6 @@
+Updating the set of feeds
+=========================
+
 Please don't commit to this module without permission from the Planet GNOME
 editors (currently Juanje Ojeda, Alberto Ruiz, Jeff Waugh). Strong editorial
 policies have kept Planet GNOME relevant and readable, so even though it seems
@@ -9,3 +12,34 @@ Please don't run update-* manually, they are executed by the update script
 and cron, to automagically do the right thing.
 
 Thanks!
+
+
+Updating the planet software
+============================
+
+The planet software we use is logically taken from upstream, which can
+be found here:
+
+  https://github.com/rubys/venus
+
+We maintain a mirror of that branch in our "upstream" branch:
+
+  http://git.gnome.org/browse/planet-web/log/?h=upstream
+
+Then we merge any patches that we might have onto our "venus" branch:
+
+  http://git.gnome.org/browse/planet-web/log/?h=venus
+
+Any patch we have there should be submitted upstream as well.
+
+Then we merge venus into master:
+
+  http://git.gnome.org/browse/planet-web/log/?h=master
+
+And that results in a planet-web with our configuration, but upstream
+code.
+
+So to update the version of planet, check out the upstream branch and
+merge in rubys/venus changes.  Then check out venus and merge upstream,
+pinging any patches that are not in rubys.  Then merge to master.
+VoilÃ!
diff --git a/update-planet b/update-planet
index 7901586..e043827 100755
--- a/update-planet
+++ b/update-planet
@@ -1,7 +1,8 @@
 #!/bin/sh
 #PLANET=/usr/local/bin/planet/planet.py
 #PLANET=/home/users/jdub/public_html/bzr/planet/devel/trunk/planet.py
-PLANET=/var/cache/gnomeweb/venus/planet.py
+#PLANET=/var/cache/gnomeweb/venus/planet.py
+PLANET=$(pwd)/planet.py
 
 if [ "$(basename `pwd`)" != "planet-web" ]; then
 	echo "YOU MUST RUN THIS IN planet-web!"
@@ -18,13 +19,6 @@ else
 	shift
 fi
 
-# Checkout Venus (planetplanet) if we do not have it
-if [ ! -d /var/cache/gnomeweb/venus ]; then
-	pushd /var/cache/gnomeweb > /dev/null
-	git clone https://github.com/rubys/venus
-	popd > /dev/null
-fi
-
 pushd config/$CONFIG > /dev/null
 nice $PLANET $@ config.ini
 popd > /dev/null