aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2003-03-01 13:51:31 +0000
committerdancer <dancer>2003-03-01 13:51:31 +0000
commit452cefee145c44a03a39805ce10e342ca2bd8be1 (patch)
treea82fc5f06a7bb5ba08fcaa4fc358394bb84bffe3
parent65be5f8280c68ba0ca62635d75799bff98aedb4d (diff)
downloadpbuilder-452cefee145c44a03a39805ce10e342ca2bd8be1.tar
pbuilder-452cefee145c44a03a39805ce10e342ca2bd8be1.tar.gz
commit
-rw-r--r--ChangeLog4
-rw-r--r--debian/changelog6
-rw-r--r--pbuilder-satisfydepends8
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index aff16d8..d3d444d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2003-03-01 Junichi Uekawa <dancer@debian.org>
+ * pbuilder-satisfydepends: Try giving out messages on fail to install,
+ and bugfix.
+ from Daniel Schepler <schepler@math.berkeley.edu>
+
* Documentation/pbuilder-doc.xml: update documentation info
somewhat to match what dxml-db2latex expects.
diff --git a/debian/changelog b/debian/changelog
index 2a4e570..64d0b27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-pbuilder (0.66) UNRELEASED; urgency=low
+pbuilder (0.66) unstable; urgency=low
* add execute option to pbuilder
* finer grained message for UML mode login.
+ * pbuilder-satisfydepends: give apt error messages, and fix some parts.
+ thanks Daniel Schepler <schepler@math.berkeley.edu> (closes: #182836)
- -- Junichi Uekawa <dancer@debian.org> Sat, 22 Feb 2003 19:49:42 +0900
+ -- Junichi Uekawa <dancer@debian.org> Sat, 1 Mar 2003 15:54:07 +0900
pbuilder (0.65) unstable; urgency=low
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends
index 4bc299d..2370a43 100644
--- a/pbuilder-satisfydepends
+++ b/pbuilder-satisfydepends
@@ -110,6 +110,10 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/ {p=1}
SATISFIED="yes"
INSTALLPKGLIST="${INSTALLPKGLIST} ${CURRENTREALPKGNAME}"
else
+ echo " -> Cannot install ${CURRENTREALPKGNAME}; apt errors follow:"
+ if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${CURRENTREALPKGNAME}; then
+ :
+ fi
# package could not be found. -- looking for alternative.
PROVIDED=""
checkbuilddep_provides ${CURRENTREALPKGNAME}
@@ -122,7 +126,9 @@ tolower($0) ~ /^'"${BD_REGEXP}"':/ {p=1}
else
# show the error for diagnostic purposes
echo " -> Cannot install $PROVIDED; apt errors follow:"
- $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${PROVIDED}
+ if $CHROOTEXEC /usr/bin/apt-get -s install ${INSTALLPKGLIST} ${PROVIDED}; then
+ :
+ fi
fi
fi
fi