1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
Index: bin/portupgrade
===================================================================
RCS file: /home/cvs/pkgtools/bin/portupgrade,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- bin/portupgrade 16 Feb 2003 16:23:57 -0000 1.215
+++ bin/portupgrade 17 Feb 2003 20:00:57 -0000 1.216
@@ -27,7 +27,7 @@
# SUCH DAMAGE.
#
-RCS_ID = %q$Idaemons: /home/cvs/pkgtools/bin/portupgrade,v 1.215 2003/02/16 16:23:57 knu Exp $
+RCS_ID = %q$Idaemons: /home/cvs/pkgtools/bin/portupgrade,v 1.216 2003/02/17 20:00:57 knu Exp $
RCS_REVISION = RCS_ID.split[2]
MYNAME = File.basename($0)
@@ -711,12 +711,11 @@
if origin
$make_args = options[:make_args] = get_make_args(origin, pkgname)
- skip = false
-
if result = $results[origin]
progress_message "Skipping '#{origin}' (#{pkgname}) which has already #{result.phrase(true)}"
- skip = true
+ $results << PkgResult.new(origin, PkgResult::SKIPPED, pkgname)
+ return
elsif !$keep_going
deps = pkg.pkgdep || []
@@ -727,16 +726,11 @@
if result && result.failed?
progress_message "Skipping '#{origin}' (#{pkgname}) because '#{o}' (#{dep}) failed"
- skip = true
- break
+ $results << PkgResult.new(origin, PkgResult::SKIPPED, pkgname)
+ return
end
end
end
-
- if skip
- $results << PkgResult.new(origin, PkgResult::SKIPPED, pkgname)
- next
- end
end
stty_sane
@@ -784,11 +778,11 @@
if $noexecute
puts "OK? [no]" if $interactive
- next
+ return
elsif $yestoall
puts "OK? [yes]" if $interactive
elsif $interactive
- prompt_yesno('OK?', true) or next
+ prompt_yesno('OK?', true) or return
end
system!(PkgDB::CMD[:pkg_create], '-vb', pkgname,
@@ -797,12 +791,11 @@
end
def do_install(origin)
- skip = false
-
if result = $results[origin]
progress_message "Skipping '#{origin}' which has already #{result.phrase(true)}"
- skip = true
+ $results << PkgResult.new(origin, PkgResult::SKIPPED)
+ return
else
unless $keep_going
make_args = get_make_args(origin)
@@ -812,16 +805,11 @@
if result && result.failed?
progress_message "Skipping '#{origin}' because '#{o}' failed"
- skip = true
- break # not next
+ $results << PkgResult.new(origin, PkgResult::SKIPPED)
+ return
end
end
end
- end
-
- if skip
- $results << PkgResult.new(origin, PkgResult::SKIPPED)
- next
end
stty_sane
|
