Bug#901172: update 7release-notes script to use the git repo of "release-notes"

Baptiste Jammet <[email protected]> Sun, 9 Sep 2018 19:17:29 +0200

Newsgroups	gmane.linux.debian.devel.www
Message-ID	<20180909191729.3ca1a705.baptiste__27369.8301906281$1536513916$gmane$org@mailoo.org>

Hello, 

Now that #901180 has been corrected & closed (in the 3 branches wheezy,
jessie & stretch), could you take a look at publishing again the
release-notes ?

Thanks.

Baptiste

7release-notes.diff (text/x-patch, 1.9 KB)

diff --git a/parts/7release-notes b/parts/7release-notes
index 395607f..570661c 100755
--- a/parts/7release-notes
+++ b/parts/7release-notes
@@ -10,22 +10,23 @@ savelog -g debwww -m 664 $notesdir/build.log >/dev/null
 
 date > $notesdir/build.log
 
-# Add the release name once released/branched out of trunk
 for release in wheezy jessie stretch ; do
     echo "rebuilding the release notes for $release" >> $notesdir/build.log
-    if ! [ -d "$notesdir/$release" ] ; then
-        echo "directory $notesdir/$release does not exist. checking out SVN" >> $notesdir/build.log
-        cd $notesdir
-        if [ "$release" = "stretch" ]; then
-            svn checkout svn://svn.debian.org/svn/ddp/manuals/trunk/release-notes $release >> $notesdir/build.log 2>&1
-        else
-            svn checkout svn://svn.debian.org/svn/ddp/manuals/branches/release-notes/$release >> $notesdir/build.log 2>&1
-        fi
+    cd $notesdir
+    if ! [ -d $notesdir/release-notes/.git ]; then
+        echo "Directory $notesdir/release-notes is not a git repository. Cloning from git." >> $notesdir/build.log
+        git clone https://salsa.debian.org/ddp-team/release-notes.git >> $notesdir/build.log 2>&1
+    fi
+    cd $notesdir/release-notes
+    if [ "$release" = "stretch" ]; then
+        # Stay on master
+        git checkout master >> $notesdir/build.log 2>&1 && git pull >> $notesdir/build.log 2>&1
     else
-        (cd $notesdir/$release && svn update) >> $notesdir/build.log 2>&1
+        # Switch to $release branch
+        git checkout $release >> $notesdir/build.log 2>&1 && git pull >> $notesdir/build.log 2>&1
     fi
-     make -C $notesdir/$release publish \
-         PUBLISHTARBALL=yes PUBLISHDIR=$webtopdir/www/releases/$release >> $notesdir/build.log 2>&1
+    make -C $notesdir/release-notes publish \
+        PUBLISHTARBALL=yes PUBLISHDIR=$webtopdir/www/releases/$release >> $notesdir/build.log 2>&1
 done
 
 date >> $notesdir/build.log

signature.asc (application/pgp-signature, 488 B)