Re: [PATCH] maintainer-scripts: Prefer temp dir /sourceware/snapshot-tmp/gcc for update_version_git

[Joseph Myers]

On Tue, 15 Dec 2020, Jakub Jelinek via Gcc-patches wrote:

> On Mon, Dec 14, 2020 at 11:58:05PM +, Joseph Myers wrote:
> > > Thanks for heads up. I'm aware of it and I don't see reason why (running 
> > > the
> > > update script in dry mode works).
> > 
> > https://gcc.gnu.org/pipermail/gccadmin/2020q4/017037.html
> > 
> > OSError: [Errno 28] No space left on device: 
> > '/tmp/tmp.Zq3p6D4MxS/gcc/.git/objects/objn31xpefh' -> 
> > '/tmp/tmp.Zq3p6D4MxS/gcc/.git/objects/db/ffb02a4bcdd4ec04af3db75d86b8cc2e52bdff'
> > 
> > Maybe change the script to use /sourceware/snapshot-tmp/gcc (which has 
> > rather more space) instead of /tmp?
> 
> So like this?  Ok for trunk?

OK.

-- 
Joseph S. Myers
jos...@codesourcery.com

[PATCH] maintainer-scripts: Prefer temp dir /sourceware/snapshot-tmp/gcc for update_version_git

[Jakub Jelinek via Gcc-patches]

On Mon, Dec 14, 2020 at 11:58:05PM +, Joseph Myers wrote:
> > Thanks for heads up. I'm aware of it and I don't see reason why (running the
> > update script in dry mode works).
> 
> https://gcc.gnu.org/pipermail/gccadmin/2020q4/017037.html
> 
> OSError: [Errno 28] No space left on device: 
> '/tmp/tmp.Zq3p6D4MxS/gcc/.git/objects/objn31xpefh' -> 
> '/tmp/tmp.Zq3p6D4MxS/gcc/.git/objects/db/ffb02a4bcdd4ec04af3db75d86b8cc2e52bdff'
> 
> Maybe change the script to use /sourceware/snapshot-tmp/gcc (which has 
> rather more space) instead of /tmp?

So like this?  Ok for trunk?

2020-12-15  Jakub Jelinek  

* update_version_git: Put BASEDIR into /sourceware/snapshot-tmp/gcc
if it exist.

--- maintainer-scripts/update_version_git.jj2020-07-28 15:39:10.222753285 
+0200
+++ maintainer-scripts/update_version_git   2020-12-15 17:50:56.945413943 
+0100
@@ -5,24 +5,31 @@
 # commit messages.
 
 GITROOT=${GITROOT:-"/git/gcc.git"}
+if [ -z "$TMPDIR" ]; then
+  if [ -d /sourceware/snapshot-tmp/gcc ]; then
+TMPDIR=/sourceware/snapshot-tmp/gcc
+  else
+TMPDIR=/tmp
+  fi
+fi
 
-# Run this from /tmp.
-export GITROOT
+# Run this from $TMPDIR.
+export GITROOT TMPDIR
 BASEDIR=`mktemp -d`
 cd "$BASEDIR"
 
 GIT=${GIT:-/usr/local/bin/git}
 
 # Assume all will go well.
-SUBDIR=$BASEDIR/gcc
+SUBDIR="$BASEDIR/gcc"
 ${GIT} clone -q -b master "$GITROOT" "$SUBDIR"
 
-cp -a $SUBDIR/contrib/gcc-changelog $BASEDIR/gcc-changelog
+cp -a "$SUBDIR"/contrib/gcc-changelog "$BASEDIR"/gcc-changelog
 cd "$SUBDIR"
 python3 ../gcc-changelog/git_update_version.py -p
 RESULT=$?
 
-cd /tmp
+cd "$TMPDIR"
 
-/bin/rm -rf $BASEDIR
+/bin/rm -rf "$BASEDIR"
 exit $RESULT


Jakub