Browse Source

Update {cow,p}builder config.

Emmanuel Bouthenot 14 years ago
parent
commit
77cbdc2eac
2 changed files with 12 additions and 4 deletions
  1. 3 2
      .pbuilder/hooks.d/B90lintian
  2. 9 2
      .zsh.d/os.d/Debian.zsh

+ 3 - 2
.pbuilder/hooks.d/B90lintian

@@ -7,11 +7,12 @@ BASEPATH="/var/cache/pbuilder/${DIST}.cow"
 #BINDMOUNTS="/var/cache/apt/archives"
 
 DISTRIBUTION=$(echo ${DIST}|cut -d- -f1)
+EXTRAPACKAGES="lintian"
+
 if echo ${DIST} | grep -q 'bpo' ; then
     #OTHERMIRROR="deb http://security.debian.org/ lenny/updates main | deb http://www.backports.org/debian lenny-backports main"
-    EXTRAPACKAGES="${EXTRAPACKAGES} debian-backports-keyring lintian"
+    EXTRAPACKAGES="${EXTRAPACKAGES} debian-backports-keyring"
 elif echo ${DIST} | grep -q '^experimental' ; then
-    EXTRAPACKAGES="${EXTRAPACKAGES} lintian"
     PBUILDERSATISFYDEPENDSCMD=/usr/lib/pbuilder/pbuilder-satisfydepends-experimental
 fi
 

+ 9 - 2
.zsh.d/os.d/Debian.zsh

@@ -11,7 +11,7 @@ cow-dist () {
         echo "Error args."
         return
     fi
-    DIST=$1
+    DIST=${1}
     shift
     OPTS=
     if [ "$1" = "--update" ]; then
@@ -25,7 +25,13 @@ cow-dist () {
             fi
         fi
     fi
-    sudo DIST=$DIST cowbuilder $@ $OPTS
+    WRAPPER=
+    if echo ${DIST} | grep -q \^sid ; then
+        if [ -x "$(which eatmydata)" ]; then
+            WRAPPER="eatmydata"
+        fi
+    fi
+    time sudo -E DIST=${DIST} ${WRAPPER} cowbuilder $@ ${OPTS}
     return $?
 }
 
@@ -33,6 +39,7 @@ alias cow-sid32="cow-dist sid-32"
 alias cow-stable32="cow-dist stable-32"
 alias cow-exp64="cow-dist experimental-64"
 alias cow-sid64="cow-dist sid-64"
+alias cow-testing64="cow-dist testing-64"
 alias cow-stable64="cow-dist stable-64"
 alias cow-stablebpo="cow-dist stable-bpo-64"