Revision: 6185
http://ipcop.svn.sourceforge.net/ipcop/?rev=6185&view=rev
Author: gespinasse
Date: 2011-12-26 09:38:09 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
This script is run from make.sh after echo -ne message.
So if dying after an error, print the die message on next line.
Modified Paths:
--------------
ipcop/trunk/tools/comp_md5.pl
Modified: ipcop/trunk/tools/comp_md5.pl
===================================================================
--- ipcop/trunk/tools/comp_md5.pl 2011-12-25 21:56:29 UTC (rev 6184)
+++ ipcop/trunk/tools/comp_md5.pl 2011-12-26 09:38:09 UTC (rev 6185)
@@ -44,14 +44,15 @@
$file_known = "$BASEDIR/doc/files-with-different-md5";
}
else {
- die "Parameters missing";
+ # print to next line if dying, as usually this script is called after echo
-en message
+ die "\nParameters missing";
}
# Check whether files exist
-die "$file_version not found" unless (-e $file_version);
-die "$file_previousversion not found" unless (-e $file_previousversion);
-die "$file_update not found" unless (-e $file_update);
-die "$file_known not found" unless (-e $file_known);
+die "\n$file_version not found" unless (-e $file_version);
+die "\n$file_previousversion not found" unless (-e $file_previousversion);
+die "\n$file_update not found" unless (-e $file_update);
+die "\n$file_known not found" unless (-e $file_known);
open (LIST, "$file_update") or die "Unable to open $file_update";
while (<LIST>) {
@@ -68,7 +69,7 @@
# Parameter 7 is optional, when used we have update split into 2 packages
if (defined($ARGV[6])) {
$file_update = "$BASEDIR/updates/$ARGV[6]/ROOTFILES.$MACHINE-$ARGV[6]";
- open (LIST, "$file_update") or die "Unable to open $file_update";
+ open (LIST, "$file_update") or die "\nUnable to open $file_update";
while (<LIST>) {
next if $_ =~ m/^#/;
chomp($_);
@@ -81,7 +82,7 @@
close (LIST);
}
-open (LIST, "$file_version") or die "Unable to open $file_version";
+open (LIST, "$file_version") or die "\nUnable to open $file_version";
while (<LIST>) {
next if $_ =~ m/^#/;
chomp($_);
@@ -92,7 +93,7 @@
}
close (LIST);
-open (LIST, "$file_previousversion") or die "Unable to open
$file_previousversion";
+open (LIST, "$file_previousversion") or die "\nUnable to open
$file_previousversion";
while (<LIST>) {
next if $_ =~ m/^#/;
chomp($_);
@@ -101,7 +102,7 @@
}
close (LIST);
-open (LIST, "$file_known") or die "Unable to open $file_known";
+open (LIST, "$file_known") or die "\nUnable to open $file_known";
while (<LIST>) {
next if $_ =~ m/^#/;
chomp($_);
@@ -122,7 +123,7 @@
}
}
-open (OUTLIST, ">diff.tmp") or die "Unable to create diff list";
+open (OUTLIST, ">diff.tmp") or die "\nUnable to create diff list";
print OUTLIST "# Comparing md5 for each file in $ARGV[1] to $ARGV[2]\n";
print OUTLIST "UPDATEK $kernel_update\n" if ($kernel_update ne
'ABCnevermatches');
print OUTLIST "UPDATESLP $squid_langpack_update\n" if ($squid_langpack_update
ne 'ABCnevermatches');
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
