Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
a759aeeb
Commit
a759aeeb
authored
Sep 21, 2004
by
Robert Ricci
Browse files
Fix DoneIfEdited and DoneIfIdentical, which became conjoined twins
through some sort of freak copy-paste accident.
parent
cab390c9
Changes
1
Hide whitespace changes
Inline
Side-by-side
install/libinstall.pm
View file @
a759aeeb
...
...
@@ -244,11 +244,8 @@ sub DoneIfEdited($) {
my
(
$filename
)
=
@_
;
if
(
!
$filename
)
{
PhaseFail
("
Bad filename passed to DoneIfEdited
");
}
open
(
FH
,
$filename
)
or
return
;
if
(
!-
e
$filename1
||
!-
e
$filename2
)
{
return
;
}
if
(
!
ExecQuiet
("
cmp -s
$filename1
$filename2
"))
{
PhaseSkip
("
Files
$filename1
and
$filename2
are identical
");
if
(
grep
/$MAGIC_STRING/
,
<
FH
>
)
{
PhaseSkip
("
File
$filename
has already been edited
\n
");
}
}
...
...
@@ -261,9 +258,11 @@ sub DoneIfIdentical($$) {
if
(
!
$filename1
||
!
$filename2
)
{
PhaseFail
("
Bad filename passed to DoneIfIdentical
");
}
open
(
FH
,
$filename1
)
or
return
;
if
(
grep
/$MAGIC_STRING/
,
<
FH
>
)
{
PhaseSkip
("
File
$filename
has already been edited
\n
");
if
(
!-
e
$filename1
||
!-
e
$filename2
)
{
return
;
}
if
(
!
ExecQuiet
("
cmp -s
$filename1
$filename2
"))
{
PhaseSkip
("
Files
$filename1
and
$filename2
are identical
");
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment