FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Debian > Debian dpkg

 
 
LinkBack Thread Tools
 
Old 06-13-2011, 09:23 PM
Cyril Brulebois
 
Default dpkg-gensymbols: Cope with empty lines.

Empty lines are quite useful as (visual) delimiters between sections in
symbols files, for example when libfoo0 contains libfoo-bar.so.0 and
libfoo-baz.so.0. Consider them like comments: ignore them. This gets us
rid of such warnings (which by the way are missing line numbers):
| dpkg-gensymbols: warning: Failed to parse a line in debian/libfoo0.symbols:
| dpkg-gensymbols: warning: Failed to parse a line in debian/libfoo0.symbols:
---
scripts/Dpkg/Shlibs/SymbolFile.pm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

Not sure whether you'll like that. Docs might need an update, ditto for
tests, which I didn't run (sorry).

diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm
index fa079b2..108fc07 100644
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -236,8 +236,8 @@ sub parse {
}
$dir =~ s{[^/]+$}{}; # Strip filename
$self->load("$dir$filename", $seen, $obj_ref, $new_base_symbol);
- } elsif (/^#/) {
- # Skip possible comments
+ } elsif (/^#|^$/) {
+ # Skip possible comments and empty lines
} elsif (/^|s*(.*)$/) {
# Alternative dependency template
push @{$self->{objects}{$$obj_ref}{deps}}, "$1";
--
1.7.5.4


--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 1308000189-10686-1-git-send-email-kibi@debian.org">http://lists.debian.org/1308000189-10686-1-git-send-email-kibi@debian.org
 
Old 06-25-2011, 08:23 AM
Raphael Hertzog
 
Default dpkg-gensymbols: Cope with empty lines.

Hi,

On Mon, 13 Jun 2011, Cyril Brulebois wrote:
> Empty lines are quite useful as (visual) delimiters between sections in
> symbols files, for example when libfoo0 contains libfoo-bar.so.0 and
> libfoo-baz.so.0. Consider them like comments: ignore them. This gets us

Thanks for the patch, merged in my tree, will push soon.

Cheers,
--
Raphaël Hertzog ◈ Debian Developer

Follow my Debian News ▶ http://RaphaelHertzog.com (English)
▶ http://RaphaelHertzog.fr (Français)


--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20110625082359.GA13308@rivendell.home.ouaza.com">h ttp://lists.debian.org/20110625082359.GA13308@rivendell.home.ouaza.com
 

Thread Tools




All times are GMT. The time now is 05:22 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org