6 files changed, 164 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/attachments/20120906/7c720284/attachment-0001.obj b/zarb-ml/mageia-dev/attachments/20120906/7c720284/attachment-0001.obj
new file mode 100644
index 000000000..f107b430a
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20120906/7c720284/attachment-0001.obj
@@ -0,0 +1,31 @@
+commit 8d6a6fa7ca65da266b878f8d45311b77fa5b0d20
+Author: Dousig <thierry.vignaud@gmail.com>
+Date:   Thu Sep 6 18:08:27 2012 +0200
+
+    fix false positive when looking for errors
+    
+    (spot by boklm)
+
+diff --git a/NEWS b/NEWS
+index 59db42e..067e370 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,4 +1,5 @@
+ 0.6.10 (unreleased)
++- fix false positive when looking for errors
+ 
+ 0.6.9
+ - failing to mount /dev/pts is not a fatal error
+diff --git a/iurt b/iurt
+index 56aa63e..f8d6ad0 100755
+--- a/iurt
++++ b/iurt
+@@ -964,7 +964,7 @@ retry:
+ 			exit();
+ 		    }
+ 		    plog('DEBUG', "calling callback for $opt->{hash}");
+-		    if ($output =~ m!/bin/ld: cannot find -l(\S*)|configure.*error.* (?:-l(\S+)|(\S+) includes)!) {
++		    if ($output =~ m!/bin/ld: cannot find -l(\S*)|configure.*[^W]error.* (?:-l(\S+)|(\S+) includes)!) {
+ 			my $missing = $1;
+ 			my @rpm = find_provides(\%pack_provide, $missing);
+ 			plog(5, "likely @rpm ($missing-devel) needed to rebuilt $srpm is not in build_requires");
+\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20120906/7c720284/attachment.obj b/zarb-ml/mageia-dev/attachments/20120906/7c720284/attachment.obj
new file mode 100644
index 000000000..f107b430a
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20120906/7c720284/attachment.obj
@@ -0,0 +1,31 @@
+commit 8d6a6fa7ca65da266b878f8d45311b77fa5b0d20
+Author: Dousig <thierry.vignaud@gmail.com>
+Date:   Thu Sep 6 18:08:27 2012 +0200
+
+    fix false positive when looking for errors
+    
+    (spot by boklm)
+
+diff --git a/NEWS b/NEWS
+index 59db42e..067e370 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,4 +1,5 @@
+ 0.6.10 (unreleased)
++- fix false positive when looking for errors
+ 
+ 0.6.9
+ - failing to mount /dev/pts is not a fatal error
+diff --git a/iurt b/iurt
+index 56aa63e..f8d6ad0 100755
+--- a/iurt
++++ b/iurt
+@@ -964,7 +964,7 @@ retry:
+ 			exit();
+ 		    }
+ 		    plog('DEBUG', "calling callback for $opt->{hash}");
+-		    if ($output =~ m!/bin/ld: cannot find -l(\S*)|configure.*error.* (?:-l(\S+)|(\S+) includes)!) {
++		    if ($output =~ m!/bin/ld: cannot find -l(\S*)|configure.*[^W]error.* (?:-l(\S+)|(\S+) includes)!) {
+ 			my $missing = $1;
+ 			my @rpm = find_provides(\%pack_provide, $missing);
+ 			plog(5, "likely @rpm ($missing-devel) needed to rebuilt $srpm is not in build_requires");
+\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20120906/8b647c9b/attachment-0001.asc b/zarb-ml/mageia-dev/attachments/20120906/8b647c9b/attachment-0001.asc
new file mode 100644
index 000000000..066091dd6
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20120906/8b647c9b/attachment-0001.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEARECAAYFAlBI5FcACgkQMYWkoYueEqvIswCcC6UnkeOopJ6c02nvJUtIdQct
+u1kAoOj/3/BEywT/OQXMtrn9kJa0X7w5
+=M1mt
+-----END PGP SIGNATURE-----
diff --git a/zarb-ml/mageia-dev/attachments/20120906/8b647c9b/attachment.asc b/zarb-ml/mageia-dev/attachments/20120906/8b647c9b/attachment.asc
new file mode 100644
index 000000000..066091dd6
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20120906/8b647c9b/attachment.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEARECAAYFAlBI5FcACgkQMYWkoYueEqvIswCcC6UnkeOopJ6c02nvJUtIdQct
+u1kAoOj/3/BEywT/OQXMtrn9kJa0X7w5
+=M1mt
+-----END PGP SIGNATURE-----
diff --git a/zarb-ml/mageia-dev/attachments/20120906/e58a4a45/attachment-0001.obj b/zarb-ml/mageia-dev/attachments/20120906/e58a4a45/attachment-0001.obj
new file mode 100644
index 000000000..1e8acc422
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20120906/e58a4a45/attachment-0001.obj
@@ -0,0 +1,44 @@
+diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
+index ba87464..6e95dc0 100644
+--- a/lib/Iurt/Chroot.pm
++++ b/lib/Iurt/Chroot.pm
+@@ -300,23 +300,11 @@ sub check_chroot_need_update {
+ 
+ sub create_build_chroot {
+     my ($chroot, $chroot_ref, $run, $config) = @_;
+-    my $ret = 0;
+     if ($run->{storage} eq 'btrfs') {
+-        $ret = create_build_chroot_btrfs($chroot, $chroot_ref, $run, $config);
++        return create_build_chroot_btrfs($chroot, $chroot_ref, $run, $config);
+     } else {
+-        $ret = create_build_chroot_tar($chroot, $chroot_ref, $run, $config);
++        return create_build_chroot_tar($chroot, $chroot_ref, $run, $config);
+     }
+-
+-    if ($ret) {
+-        my $urpmi = $run->{urpmi};
+-        if ($urpmi->{use__urpmi_root} && !$run->{chrooted_urpmi}) {
+-	    if (!$urpmi->add_media__urpmi_root($chroot, $config->{base_media})) {
+-	        plog('ERROR', "urpmi.addmedia --urpmi-root failed");
+-	        return;
+-	    }
+-        }
+-    }
+-    return $ret;
+ }
+ 
+ sub create_build_chroot_tar {
+@@ -440,8 +428,11 @@ sub build_chroot {
+     }
+ 
+     # remove files used by --urpmi-root
+-    sudo($config, "--rm", "$tmp_chroot/etc/urpmi/urpmi.cfg");
+-    sudo($config, "--rm", "$tmp_chroot/var/lib/urpmi/*");
++    #if (!$urpmi->{use__urpmi_root} || $run->{chrooted_urpmi}) {
++    if (!($urpmi->{use__urpmi_root} && !$run->{chrooted_urpmi})) {
++       sudo($config, "--rm", "$tmp_chroot/etc/urpmi/urpmi.cfg");
++       sudo($config, "--rm", "$tmp_chroot/var/lib/urpmi/*");
++    }
+ 
+     # rpm is not running as root and cannot directly write to $tmp_chroot/var/log/qa
+     system("rpm -qa --root $tmp_chroot --qf '\%{NAME}-\%{VERSION}-\%{RELEASE}.\%{ARCH}\n' | sort > $tmp_chroot/tmp/qa");
+\ No newline at end of file
diff --git a/zarb-ml/mageia-dev/attachments/20120906/e58a4a45/attachment.obj b/zarb-ml/mageia-dev/attachments/20120906/e58a4a45/attachment.obj
new file mode 100644
index 000000000..1e8acc422
--- /dev/null
+++ b/zarb-ml/mageia-dev/attachments/20120906/e58a4a45/attachment.obj
@@ -0,0 +1,44 @@
+diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
+index ba87464..6e95dc0 100644
+--- a/lib/Iurt/Chroot.pm
++++ b/lib/Iurt/Chroot.pm
+@@ -300,23 +300,11 @@ sub check_chroot_need_update {
+ 
+ sub create_build_chroot {
+     my ($chroot, $chroot_ref, $run, $config) = @_;
+-    my $ret = 0;
+     if ($run->{storage} eq 'btrfs') {
+-        $ret = create_build_chroot_btrfs($chroot, $chroot_ref, $run, $config);
++        return create_build_chroot_btrfs($chroot, $chroot_ref, $run, $config);
+     } else {
+-        $ret = create_build_chroot_tar($chroot, $chroot_ref, $run, $config);
++        return create_build_chroot_tar($chroot, $chroot_ref, $run, $config);
+     }
+-
+-    if ($ret) {
+-        my $urpmi = $run->{urpmi};
+-        if ($urpmi->{use__urpmi_root} && !$run->{chrooted_urpmi}) {
+-	    if (!$urpmi->add_media__urpmi_root($chroot, $config->{base_media})) {
+-	        plog('ERROR', "urpmi.addmedia --urpmi-root failed");
+-	        return;
+-	    }
+-        }
+-    }
+-    return $ret;
+ }
+ 
+ sub create_build_chroot_tar {
+@@ -440,8 +428,11 @@ sub build_chroot {
+     }
+ 
+     # remove files used by --urpmi-root
+-    sudo($config, "--rm", "$tmp_chroot/etc/urpmi/urpmi.cfg");
+-    sudo($config, "--rm", "$tmp_chroot/var/lib/urpmi/*");
++    #if (!$urpmi->{use__urpmi_root} || $run->{chrooted_urpmi}) {
++    if (!($urpmi->{use__urpmi_root} && !$run->{chrooted_urpmi})) {
++       sudo($config, "--rm", "$tmp_chroot/etc/urpmi/urpmi.cfg");
++       sudo($config, "--rm", "$tmp_chroot/var/lib/urpmi/*");
++    }
+ 
+     # rpm is not running as root and cannot directly write to $tmp_chroot/var/log/qa
+     system("rpm -qa --root $tmp_chroot --qf '\%{NAME}-\%{VERSION}-\%{RELEASE}.\%{ARCH}\n' | sort > $tmp_chroot/tmp/qa");
+\ No newline at end of file