Add exclude feature (for combining with EPEL).

diff --git a/fed-16-x86_64.cfg.template b/fed-16-x86_64.cfg.template
index c1cb9ee..fe6b19b 100644 (file)
--- a/fed-16-x86_64.cfg.template
+++ b/fed-16-x86_64.cfg.template
@@ -23,10 +23,12 @@ syslog_device=
 [fedora]
 name=Fedora 16 - $basearch
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-16&arch=$basearch
+@EXCLUDES@
 
 [update]
 name=Fedora 16 - $basearch - Updates
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f16&arch=$basearch
+@EXCLUDES@
 
 [EGI-trustanchors]
 name=EGI-trustanchors

diff --git a/fed-17-x86_64.cfg.template b/fed-17-x86_64.cfg.template
index 0e04e60..06255d5 100644 (file)
--- a/fed-17-x86_64.cfg.template
+++ b/fed-17-x86_64.cfg.template
@@ -23,10 +23,12 @@ syslog_device=
 [fedora]
 name=Fedora 17 - $basearch
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-17&arch=$basearch
+@EXCLUDES@
 
 [update]
 name=Fedora 17 - $basearch - Updates
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f17&arch=$basearch
+@EXCLUDES@
 
 [EGI-trustanchors]
 name=EGI-trustanchors

diff --git a/fed-18-x86_64.cfg.template b/fed-18-x86_64.cfg.template
index 37565f6..43463f2 100644 (file)
--- a/fed-18-x86_64.cfg.template
+++ b/fed-18-x86_64.cfg.template
@@ -23,10 +23,12 @@ syslog_device=
 [fedora]
 name=Fedora 18 - $basearch
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-18&arch=$basearch
+@EXCLUDES@
 
 [update]
 name=Fedora 18 - $basearch - Updates
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f18&arch=$basearch
+@EXCLUDES@
 
 [EGI-trustanchors]
 name=EGI-trustanchors

diff --git a/mock.sh b/mock.sh
index 4d05cad..9a4bc43 100755 (executable)
--- a/mock.sh
+++ b/mock.sh
@@ -26,6 +26,7 @@ DEBREPO_MAIN=${DEBREPO_MAIN:-~/debian}
 DEBREPO_DEPS=${DEBREPO_DEPS:-~/debian-externals}
 DEBDISTRO=${DEBDISTRO:-stable}
 #PBUILDER_OPTS='--debbuildopts "-j8"'
+EXCLUDE=${EXCLUDE:-''}
 
 if test "x$1" = "x-r"; then
        CONF="$2"
@@ -80,7 +81,9 @@ if test "$1" != "clean"; then
                        touch mock/site-defaults.cfg
                fi
                if test ! -s mock/$CONF.cfg -o $LAUNCHDIR/$CONF.cfg.template -nt mock/$CONF.cfg; then
-                       sed -e "s,@PWD@,`pwd`," -e "s,@REPO@,results," -e "s,@REPO_EXT@,externals," $LAUNCHDIR/$CONF.cfg.template > mock/$CONF.cfg
+                       EXCLUDES='@EXCLUDES@'
+                       if test -n "$EXCLUDE"; then EXCLUDES="exclude=$EXCLUDE"; fi
+                       sed -e "s,@PWD@,`pwd`," -e "s,@REPO@,results," -e "s,@REPO_EXT@,externals," -e "s,@EXCLUDES@,$EXCLUDES," $LAUNCHDIR/$CONF.cfg.template | grep -v '@EXCLUDES@' > mock/$CONF.cfg
                fi
 
                createrepo results

diff --git a/sl-5-i386.cfg.template b/sl-5-i386.cfg.template
index 61b7142..6814a8f 100644 (file)
--- a/sl-5-i386.cfg.template
+++ b/sl-5-i386.cfg.template
@@ -28,16 +28,19 @@ name=SL 5 base
 baseurl=http://scientificlinux.physik.uni-muenchen.de/mirror/scientific/5x/$basearch/SL
        ftp://mirror.switch.ch/mirror/scientificlinux/5x/$basearch/SL
        ftp://ftp.scientificlinux.org/linux/scientific/5x/$basearch/SL
+@EXCLUDES@
 
 [update]
 name=SL 5 updates
 baseurl=http://scientificlinux.physik.uni-muenchen.de/mirror/scientific/5x/$basearch/updates/security
        ftp://mirror.switch.ch/mirror/scientificlinux/5x/$basearch/updates/security
        ftp://ftp.scientificlinux.org/linux/scientific/5x/$basearch/updates/security
+@EXCLUDES@
 
 [extras]
 name=epel
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=i386
+@EXCLUDES@
 
 [EGI-trustanchors]
 name=EGI-trustanchors

diff --git a/sl-5-x86_64.cfg.template b/sl-5-x86_64.cfg.template
index 4c88c69..bd0b0a3 100644 (file)
--- a/sl-5-x86_64.cfg.template
+++ b/sl-5-x86_64.cfg.template
@@ -28,16 +28,19 @@ name=SL 5 base
 baseurl=http://scientificlinux.physik.uni-muenchen.de/mirror/scientific/5x/$basearch/SL
        ftp://mirror.switch.ch/mirror/scientificlinux/5x/$basearch/SL
        ftp://ftp.scientificlinux.org/linux/scientific/5x/$basearch/SL
+@EXCLUDES@
 
 [update]
 name=SL 5 updates
 baseurl=http://scientificlinux.physik.uni-muenchen.de/mirror/scientific/5x/$basearch/updates/security
        ftp://mirror.switch.ch/mirror/scientificlinux/5x/$basearch/updates/security
        ftp://ftp.scientificlinux.org/linux/scientific/5x/$basearch/updates/security
+@EXCLUDES@
 
 [extras]
 name=epel
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=x86_64
+@EXCLUDES@
 
 [EGI-trustanchors]
 name=EGI-trustanchors

diff --git a/sl-6-i386.cfg.template b/sl-6-i386.cfg.template
index 4df03d5..54544c8 100644 (file)
--- a/sl-6-i386.cfg.template
+++ b/sl-6-i386.cfg.template
@@ -25,16 +25,19 @@ name=SL 6 base
 baseurl=http://scientificlinux.physik.uni-muenchen.de/mirror/scientific/6x/$basearch/os
        ftp://mirror.switch.ch/mirror/scientificlinux/6x/$basearch/os
        ftp://ftp.scientificlinux.org/linux/scientific/6x/$basearch/os
+@EXCLUDES@
 
 [update]
 name=SL 6 updates
 baseurl=http://scientificlinux.physik.uni-muenchen.de/mirror/scientific/6x/$basearch/updates/security
        ftp://mirror.switch.ch/mirror/scientificlinux/6x/$basearch/updates/security
        ftp://ftp.scientificlinux.org/linux/scientific/6x/$basearch/updates/security
+@EXCLUDES@
 
 [extras]
 name=epel
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=i386
+@EXCLUDES@
 
 [EGI-trustanchors]
 name=EGI-trustanchors

diff --git a/sl-6-x86_64.cfg.template b/sl-6-x86_64.cfg.template
index cfc63a6..ffc8948 100644 (file)
--- a/sl-6-x86_64.cfg.template
+++ b/sl-6-x86_64.cfg.template
@@ -25,16 +25,19 @@ name=SL 6 base
 baseurl=http://scientificlinux.physik.uni-muenchen.de/mirror/scientific/6x/$basearch/os
        ftp://mirror.switch.ch/mirror/scientificlinux/6x/$basearch/os
        ftp://ftp.scientificlinux.org/linux/scientific/6x/$basearch/os
+@EXCLUDES@
 
 [update]
 name=SL 6 updates
 baseurl=http://scientificlinux.physik.uni-muenchen.de/mirror/scientific/6x/$basearch/updates/security
        ftp://mirror.switch.ch/mirror/scientificlinux/6x/$basearch/updates/security
        ftp://ftp.scientificlinux.org/linux/scientific/6x/$basearch/updates/security
+@EXCLUDES@
 
 [extras]
 name=epel
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64
+@EXCLUDES@
 
 [EGI-trustanchors]
 name=EGI-trustanchors