From 19b9d80313f0d013bb414fdaf4701436298a6c5f Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Thu, 14 Oct 1999 02:20:17 +0000 Subject: [PATCH] Reinstate patch to not read available-filoe when doing listfiles Get SHELL when showing diff in configure --- ChangeLog | 6 ++++++ debian/changelog | 13 ++++++++++--- main/configure.c | 2 ++ main/enquiry.c | 7 +++++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fd51ab2..97c092dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 14 04:16:25 CEST 1999 Wichert Akkerman + + * Reinstate patch to not read available-file with doing listfiles. + * Don't forget to get the correct SHELL before showing a diff of + conffiles! + Thu Oct 14 03:37:52 CEST 1999 Wichert Akkerman * Add mips to archtable diff --git a/debian/changelog b/debian/changelog index d21fcf62..aab981fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,15 +2,22 @@ dpkg (1.4.1.15) unstable; urgency=low * non-maintainer release. * Move dselect into its own package - * Changes to support HURD * Remove conffiles before directories when purging * Check if integrity from other packages will broken when processing an archive * dpkg-deb can handle package made with Linux ar. * Add check to update-alternatives to see if the sequencecode is between 0 and 99 - - -- Wichert Akkerman UNRELEASED + * Fix failed assertion, which was actually two bugs: a logic error in + checkforremoval and a wrong assumption in findbreakcycle + * dselect doesn't die when you resize the terminal + * check if a file is also in a new package before removing it when upgrading + * offer to show a diff between the old and new conffile + * dpkg-scanpackages: don't abort but only skip a package if we can't + open it + * Add HURD-support to start-stop-daemon + + -- Wichert Akkerman Wed, 13 Oct 1999 21:52:17 +0200 dpkg (1.4.1.14) unstable; urgency=low diff --git a/main/configure.c b/main/configure.c index c5b4fbae..ab810447 100644 --- a/main/configure.c +++ b/main/configure.c @@ -277,6 +277,8 @@ void deferred_configure(struct pkginfo *pkg) { p= getenv(PAGERENV); if (!p || !*p) p= DEFAULTPAGER; sprintf(cmdbuf, "diff -u %.250s %.250s | %.250s", cdr.buf, cdr2.buf, p); + s= getenv(SHELLENV); + if (!s || !*s) s= DEFAULTSHELL; execlp(s,s,"-c", cmdbuf); ohshite(_("failed to run diff (%.250s)"), cmdbuf); } diff --git a/main/enquiry.c b/main/enquiry.c index 01686480..fbe31e09 100644 --- a/main/enquiry.c +++ b/main/enquiry.c @@ -389,8 +389,11 @@ void enqperpackage(const char *const *argv) { badusage(_("--%s needs at least one package name argument"), cipaction->olong); failures= 0; - modstatdb_init(admindir,msdbrw_readonly); - + if (cipaction->arg==act_listfiles) + modstatdb_init(admindir,msdbrw_readonly|msdbrw_noavail); + else + modstatdb_init(admindir,msdbrw_readonly); + while ((thisarg= *argv++) != 0) { pkg= findpackage(thisarg); -- 2.39.5