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
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-dev] [soft-commits] [5686] For non-local media, iurt is suppressing the urpmi. cfg file while creating
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5Bsoft-commits%5D%20%5B5686%5D%20For%20non-local%20media%2C%0A%20iurt%20is%20suppressing%20the%20urpmi.%20cfg%20file%20while%20creating&In-Reply-To=%3CCAONrEtaXWqKfrrM9D0TLGxmjrqd4vWMpq0j5cTM_oxVzh9RNHg%40mail.gmail.com%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="018498.html">
<LINK REL="Next" HREF="018499.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] [soft-commits] [5686] For non-local media, iurt is suppressing the urpmi. cfg file while creating</H1>
<B>Thierry Vignaud</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5Bsoft-commits%5D%20%5B5686%5D%20For%20non-local%20media%2C%0A%20iurt%20is%20suppressing%20the%20urpmi.%20cfg%20file%20while%20creating&In-Reply-To=%3CCAONrEtaXWqKfrrM9D0TLGxmjrqd4vWMpq0j5cTM_oxVzh9RNHg%40mail.gmail.com%3E"
TITLE="[Mageia-dev] [soft-commits] [5686] For non-local media, iurt is suppressing the urpmi. cfg file while creating">thierry.vignaud at gmail.com
</A><BR>
<I>Wed Sep 5 18:05:54 CEST 2012</I>
<P><UL>
<LI>Previous message: <A HREF="018498.html">[Mageia-dev] Directory conflict ?
</A></li>
<LI>Next message: <A HREF="018499.html">[Mageia-dev] [soft-commits] [5686] For non-local media, iurt is suppressing the urpmi. cfg file while creating
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#18485">[ date ]</a>
<a href="thread.html#18485">[ thread ]</a>
<a href="subject.html#18485">[ subject ]</a>
<a href="author.html#18485">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>On 5 September 2012 17:11, <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">root at mageia.org</A>> wrote:
><i> Revision 5686 Author rtp Date 2012-09-05 17:11:26 +0200 (Wed, 05 Sep 2012)
</I>><i>
</I>><i> Log Message
</I>><i>
</I>><i> For non-local media, iurt is suppressing the urpmi.cfg file while creating
</I>><i> the chroot.
</I>
Wrong, it's always removed
><i> This has the side effect of forcing people to use things like
</I>><i> --chrooted-urpmi even if the iurt configuration is fine (since it managed
</I>><i> to create the chroot). So, add media while creating the build chroot for
</I>><i> non-local media, as long as --chrooted-urpmi has not been used.
</I>
Anyway this is insane IMHO: new logic is:
- add media
- install pkgs
- remove media
- readd media
Either you should use --chrooted-urpmi (instead of re-implementing it)
or you should just not remove the media in the first place when using
use__urpmi_root,
aka if using remote media
><i> --- build_system/iurt/trunk/lib/Iurt/Chroot.pm 2012-09-05 15:07:40 UTC (rev
</I>><i> 5685)
</I>><i> +++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2012-09-05 15:11:26 UTC (rev
</I>><i> 5686)
</I>><i> @@ -300,11 +300,23 @@
</I>><i>
</I>><i> sub create_build_chroot {
</I>><i> my ($chroot, $chroot_ref, $run, $config) = @_;
</I>><i> + my $ret = 0;
</I>><i> if ($run->{storage} eq 'btrfs') {
</I>
this is perl, no need to initialize to 0.
><i> - return create_build_chroot_btrfs($chroot, $chroot_ref, $run,
</I>><i> $config);
</I>><i> + $ret = create_build_chroot_btrfs($chroot, $chroot_ref, $run,
</I>><i> $config);
</I>><i> } else {
</I>><i> - return create_build_chroot_tar($chroot, $chroot_ref, $run,
</I>><i> $config);
</I>><i> + $ret = create_build_chroot_tar($chroot, $chroot_ref, $run,
</I>><i> $config);
</I>><i> }
</I>><i> +
</I>><i> + if ($ret) {
</I>><i> + my $urpmi = $run->{urpmi};
</I>><i> + if ($urpmi->{use__urpmi_root} && !$run->{chrooted_urpmi}) {
</I>><i> + if (!$urpmi->add_media__urpmi_root($chroot, $config->{base_media})) {
</I>><i> + plog('ERROR', "urpmi.addmedia --urpmi-root failed");
</I>><i> + return;
</I>><i> + }
</I>><i> + }
</I>><i> + }
</I>><i> + return $ret;
</I>><i> }
</I>><i>
</I>><i> sub create_build_chroot_tar {
</I></PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="018498.html">[Mageia-dev] Directory conflict ?
</A></li>
<LI>Next message: <A HREF="018499.html">[Mageia-dev] [soft-commits] [5686] For non-local media, iurt is suppressing the urpmi. cfg file while creating
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#18485">[ date ]</a>
<a href="thread.html#18485">[ thread ]</a>
<a href="subject.html#18485">[ subject ]</a>
<a href="author.html#18485">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
mailing list</a><br>
</body></html>
|