[PATCH] added default DISTRIBUTION support etc.

[Osamu Aoki]

---
 pbuilder-checkparams |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index cadd24b..1fc58a6 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -242,12 +242,39 @@ if [ -z "${CHROOTEXEC}" ]; then
     CHROOTEXEC="chroot $BUILDPLACE "
 fi
 
-# handle 'experimental' specially. -- required for raw pbuilder (create/update) only.
-if [ "$DISTRIBUTION" = "experimental" ]; then
-    DISTRIBUTION="sid"
-    EXPERIMENTAL="true"
-else 
-    EXPERIMENTAL=
+EXPERIMENTAL=""
+if [ -z "${PBMODEOPTION}" ]; then
+    # classic mode: handle 'experimental' specially. -- required for raw pbuilder (create/update) only.
+    if [ "$DISTRIBUTION" = "experimental" ]; then
+        DISTRIBUTION="sid"
+        EXPERIMENTAL="true"
+    fi
+    # classic mode enhanced: use sid as default distribution
+    if [ -z "$DISTRIBUTION" ]; then
+        DISTRIBUTION="sid"
+    fi
+else
+    # new mode: default value
+    if [ -z "$DISTRIBUTION" ]; then
+        DISTRIBUTION=${PBMODEOPTION}
+    fi
+    # convert all odd distributions
+    if [ "$DISTRIBUTION" = "experimental" ]; then
+        DISTRIBUTION="sid"
+    elif [ "${DISTRIBUTION%/volatile}" != "${DISTRIBUTION}" ]; then
+        DISTRIBUTION="${DISTRIBUTION%/volatile}"
+    elif [ "${DISTRIBUTION%/volatile-sloppy}" != "${DISTRIBUTION}" ]; then
+        DISTRIBUTION="${DISTRIBUTION%/volatile-sloppy}"
+    elif [ "${DISTRIBUTION%-backports}" != "${DISTRIBUTION}" ]; then
+        DISTRIBUTION=${DISTRIBUTION%-backports}
+    fi
+    # Does mode use "@@@MIRRORSITE@@@"? If not, get it from sources.list
+    if [ -f /usr/share/pbuilder/${PBMODEOPTION}/apt/sources.list ]; then
+        ALTERNATIVE_MIRROR=$( sed -n -e '1s/^deb *\([^ ]*\) .*$/\1/p'</usr/share/pbuilder/${PBMODEOPTION}/apt/sources.list )
+        if [ ${ALTERNATIVE_MIRROR} != "@@@MIRRORSITE@@@" ]; then
+            MIRRORSITE="${ALTERNATIVE_MIRROR}"
+        fi
+    fi
 fi
 
 case "$PBCURRENTCOMMANDLINEOPERATION" in 
-- 
1.5.6.3


--HlL+5n6rz5pIUxbD
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0007-Adjusted-for-mode-option-w-o-preferences.patch"