Bug#630604: LB_PARENT_ARCHIVE_AREAS default handling is wrong
Package: live-build
Version: 3.0~a21-1
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch oneiric
--parent-archive-areas seems to be broken, because the default for
LB_PARENT_ARCHIVE_AREAS checks whether LB_ARCHIVE_AREAS is already set,
not whether LB_PARENT_ARCHIVE_AREAS is already set. Patch attached.
(Or is --parent-archive-areas deprecated? I notice that it isn't
documented. But then, why does the LB_MODE=progress case do
LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main}"?)
Thanks,
--
Colin Watson [cjwatson@ubuntu.com]
>From c9a8f67ca04635069263ff735ff6e69897e8380b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Wed, 15 Jun 2011 15:15:34 +0100
Subject: [PATCH] Fix default for LB_PARENT_ARCHIVE_AREAS.
---
functions/defaults.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 67b34e4..d026996 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -550,12 +550,12 @@ Set_defaults ()
;;
ubuntu)
- LB_PARENT_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}"
+ LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main restricted}"
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-${LB_PARENT_ARCHIVE_AREAS}}"
;;
*)
- LB_PARENT_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
+ LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main}"
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-${LB_PARENT_ARCHIVE_AREAS}}"
;;
esac
--
1.7.5.4
Reply to: