diff options
| author | Emilio Pozuelo Monfort <pochu@debian.org> | 2011-02-19 19:29:19 +0000 |
|---|---|---|
| committer | Junichi Uekawa <dancer@netfort.gr.jp> | 2011-06-24 19:32:19 +0900 |
| commit | b82c625202cbb0a46f47bb4eb7c25eac8eb8bb54 (patch) | |
| tree | 657e34131a99a2c03b007f6df9061111b330914e /pbuilder-buildpackage-funcs | |
| parent | b8ba16bbb5354d65c6857df64b8488578ca648f7 (diff) | |
| download | pbuilder-b82c625202cbb0a46f47bb4eb7c25eac8eb8bb54.tar pbuilder-b82c625202cbb0a46f47bb4eb7c25eac8eb8bb54.tar.gz | |
Bug#606699: pbuilder NMU
Hi,
I talked to Junichi and he told me it was fine if I NMU'ed pbuilder to fix these
bugs. This is the debdiff for my NMU.
Regards,
Emilio
Diffstat (limited to 'pbuilder-buildpackage-funcs')
| -rw-r--r-- | pbuilder-buildpackage-funcs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index 0c19dc7..fedbfc4 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -30,6 +30,25 @@ function copydsc () { done } +function checkarchitecture () { + local DSCFILE="$1" + local ARCHES="$(cat $DSCFILE | grep Architecture | sed 's/^[^:]\+:\s*//')" + local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) + local VALID_ARCH + for d in $ARCHES; do + if dpkg-architecture -a$ARCH -i$d; then + VALID_ARCH="yes" + break + fi + done + if [ ! $VALID_ARCH ] && [ ! "$ARCHES" = "all" ]; then + local msg="E: $ARCH not in arch list or does not match any " + msg="$msg arch wildcards: $ARCHES" + log $msg + exit 2 + fi +} + function checkbuilddep () { # call satisfydepends local BUILDOPT="--binary-all" |