The branch, master has been updated
via f780069c1aea962236c92968c05bbd21db30d3eb (commit)
via 1f5782739a395cff085b9d246eb47b866fee1f22 (commit)
via c6670c91196ecf5e36c707ab7f3d7cf3da8fb025 (commit)
from f006a48bcc7a19fb4726d95bf2b400a3e902c878 (commit)
- Shortlog ------------------------------------------------------------
f780069 install-info: Ignore wrapped lines when matching section titles
1f57827 dselect: Do not loop endlessly with very long package descriptions
c6670c9 dselect: Do not disaplay garbage on monochrome terminals
Summary of changes:
ChangeLog | 15 +++++++++++++++
debian/changelog | 9 +++++++++
dselect/baselist.cc | 6 ++++++
scripts/install-info.pl | 2 +-
4 files changed, 31 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit f780069c1aea962236c92968c05bbd21db30d3eb
Author: Ian Zimmerman <[EMAIL PROTECTED]>
Date: Tue Jan 1 03:19:49 2008 +0200
install-info: Ignore wrapped lines when matching section titles
Closes: #214684
diff --git a/ChangeLog b/ChangeLog
index 0359648..8e06afa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01 Ian Zimmerman <[EMAIL PROTECTED]>
+
+ * scripts/install-info.pl: Ignore wrapped lines when matching
+ section titles.
+
2008-01-01 John Zaitseff <[EMAIL PROTECTED]>
* dselect/baselist.cc (baselist::wordwrapinfo): Stop processing when
diff --git a/debian/changelog b/debian/changelog
index ffd368a..141ceaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ dpkg (1.14.15) UNRELEASED; urgency=low
* Do not loop endlessly in dselect with very long package descriptions.
Closes: #179320, #342495
Thanks to John Zaitseff.
+ * Ignore wrapped lines in install-info when matching section titles.
+ Closes: #214684
+ Thanks to Andreas Metzler and Ian Zimmerman.
[ Updated dpkg translations ]
* Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918
diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index 906322c..edaded6 100755
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -352,7 +352,7 @@ if (!$remove) {
$mss= -1;
for ($i=0; $i<=$#work; $i++) {
$_= $work[$i];
- next if m/^\*/;
+ next if m/^(\*|\s)/;
next unless m/$sectionre/io;
$mss= $i+1; last;
}
commit 1f5782739a395cff085b9d246eb47b866fee1f22
Author: John Zaitseff <[EMAIL PROTECTED]>
Date: Tue Jan 1 02:53:21 2008 +0200
dselect: Do not loop endlessly with very long package descriptions
Closes: #179320, #342495
diff --git a/ChangeLog b/ChangeLog
index 66b0a16..0359648 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01 John Zaitseff <[EMAIL PROTECTED]>
+
+ * dselect/baselist.cc (baselist::wordwrapinfo): Stop processing when
+ exceeding infopad line limit, and add a warning message.
+
2008-01-01 Sven Rudolph <[EMAIL PROTECTED]>
* dselect/baselist.cc (baselist::startdisplay): Set helpscreen_attr
diff --git a/debian/changelog b/debian/changelog
index 1af4204..ffd368a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ dpkg (1.14.15) UNRELEASED; urgency=low
* Do not disaplay garbage in dselect on monochrome terminals, by setting
a missing ncurses character attribute. Closes: #155741, #157093
Thanks to Sven Rudolph.
+ * Do not loop endlessly in dselect with very long package descriptions.
+ Closes: #179320, #342495
+ Thanks to John Zaitseff.
[ Updated dpkg translations ]
* Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index fd6bcdc..8ba7ff0 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -365,6 +365,11 @@ void baselist::wordwrapinfo(int offset, const char *m) {
wrapping= 1;
}
if (!p) break;
+ if (getcury(infopad) == (MAX_DISPLAY_INFO - 1)) {
+ waddstr(infopad,
+ "[The package description is too long and has been
truncated...]");
+ break;
+ }
m= ++p;
}
if (debug) fprintf(debug,"baselist[%p]::wordwrapinfo() done\n",this);
commit c6670c91196ecf5e36c707ab7f3d7cf3da8fb025
Author: Sven Rudolph <[EMAIL PROTECTED]>
Date: Tue Jan 1 02:24:51 2008 +0200
dselect: Do not disaplay garbage on monochrome terminals
Set a missing ncurses character attribute. Closes: #155741, #157093
diff --git a/ChangeLog b/ChangeLog
index e8589af..66b0a16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01 Sven Rudolph <[EMAIL PROTECTED]>
+
+ * dselect/baselist.cc (baselist::startdisplay): Set helpscreen_attr
+ on monochrome terminals.
+
2007-12-28 Raphael Hertzog <[EMAIL PROTECTED]>
* scripts/Dpkg.pm: Add a warning to avoid adding unnecessary stuff
diff --git a/debian/changelog b/debian/changelog
index fd55f19..1af4204 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ dpkg (1.14.15) UNRELEASED; urgency=low
* Remove disabled, obsolete and quite incomplete Hebrew translations.
* Revert dpkg-dev versioned dependency bump on dpkg >= 1.14.13 back to
>= 1.14.6, as the compression variables are now in a module in dpkg-dev.
+ * Do not disaplay garbage in dselect on monochrome terminals, by setting
+ a missing ncurses character attribute. Closes: #155741, #157093
+ Thanks to Sven Rudolph.
[ Updated dpkg translations ]
* Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index 64446eb..fd6bcdc 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -151,6 +151,7 @@ void baselist::startdisplay() {
info_attr= list_attr;
info_headattr= A_BOLD;
whatinfo_attr= thisstate_attr;
+ helpscreen_attr= A_NORMAL;
}
// set up windows and pads, based on screen size
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
