diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-November/000959.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2010-November/000959.html | 143 |
1 files changed, 143 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-November/000959.html b/zarb-ml/mageia-sysadm/2010-November/000959.html new file mode 100644 index 000000000..d40819b86 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-November/000959.html @@ -0,0 +1,143 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [155] fix indentation + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B155%5D%20fix%20indentation&In-Reply-To=%3C20101125234519.439443FB18%40valstar.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="000958.html"> + <LINK REL="Next" HREF="000960.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [155] fix indentation</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B155%5D%20fix%20indentation&In-Reply-To=%3C20101125234519.439443FB18%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [155] fix indentation">root at mageia.org + </A><BR> + <I>Fri Nov 26 00:45:19 CET 2010</I> + <P><UL> + <LI>Previous message: <A HREF="000958.html">[Mageia-sysadm] [154] factorize chroot rebuild code +</A></li> + <LI>Next message: <A HREF="000960.html">[Mageia-sysadm] [156] remove basesystem_media_root, basesystem_media, and use_system_distrib config options, they have no use now that we don' t need a repository tree to check if chroot is up-to-date +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#959">[ date ]</a> + <a href="thread.html#959">[ thread ]</a> + <a href="subject.html#959">[ subject ]</a> + <a href="author.html#959">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 155 +Author: blino +Date: 2010-11-26 00:45:19 +0100 (Fri, 26 Nov 2010) +Log Message: +----------- +fix indentation + +Modified Paths: +-------------- + build_system/iurt/trunk/lib/Iurt/Chroot.pm + +Modified: build_system/iurt/trunk/lib/Iurt/Chroot.pm +=================================================================== +--- build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:43:52 UTC (rev 154) ++++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:45:19 UTC (rev 155) +@@ -425,37 +425,37 @@ + plog('NOTIFY', "creating chroot"); + plog('DEBUG', "... with packages " . join(', ', @{$opt->{packages}})); + +- mkdir_p($tmp_chroot); +- if (!-f $chroot_tar) { +- plog("rebuild chroot tarball"); +- $rebuild = 1; +- } else { +- link $chroot_tar, $tmp_tar or die "FATAL: could not initialize chroot ($!)\n"; ++ mkdir_p($tmp_chroot); ++ if (!-f $chroot_tar) { ++ plog("rebuild chroot tarball"); ++ $rebuild = 1; ++ } else { ++ link $chroot_tar, $tmp_tar or die "FATAL: could not initialize chroot ($!)\n"; + +- plog('DEBUG', "decompressing /var/log/qa from $chroot_tar in $tmp_chroot"); +- sudo($run, $config, '--untar', $chroot_tar, $tmp_chroot, "./var/log/qa"); ++ plog('DEBUG', "decompressing /var/log/qa from $chroot_tar in $tmp_chroot"); ++ sudo($run, $config, '--untar', $chroot_tar, $tmp_chroot, "./var/log/qa"); + +- my $tmp_urpmi = mktemp("$chroot.tmp.XXXXXX"); +- my @installed_pkgs = chomp_(cat_("$tmp_chroot/var/log/qa")); +- my @available_pkgs = chomp_(`urpmq --urpmi-root $tmp_urpmi --use-distrib $run->{urpmi}{distrib_url} --list -f 2>/dev/null`); +- my @removed_pkgs = difference2(\@installed_pkgs, \@available_pkgs); +- rm_rf($tmp_urpmi); ++ my $tmp_urpmi = mktemp("$chroot.tmp.XXXXXX"); ++ my @installed_pkgs = chomp_(cat_("$tmp_chroot/var/log/qa")); ++ my @available_pkgs = chomp_(`urpmq --urpmi-root $tmp_urpmi --use-distrib $run->{urpmi}{distrib_url} --list -f 2>/dev/null`); ++ my @removed_pkgs = difference2(\@installed_pkgs, \@available_pkgs); ++ rm_rf($tmp_urpmi); + +- if (@installed_pkgs) { +- if (@removed_pkgs) { +- plog('DEBUG', "changed packages: @removed_pkgs"); +- plog('NOTIFY', "Rebuilding chroot tarball"); +- $rebuild = 1; +- } else { +- plog('NOTIFY', "chroot tarball is already up-to-date"); +- link $tmp_tar, $chroot_tar; +- } +- } else { +- plog('DEBUG', "can't open $tmp_chroot/var/log/qa"); +- plog('ERR', "can't check chroot, recreating"); ++ if (@installed_pkgs) { ++ if (@removed_pkgs) { ++ plog('DEBUG', "changed packages: @removed_pkgs"); ++ plog('NOTIFY', "Rebuilding chroot tarball"); + $rebuild = 1; +- } +- } ++ } else { ++ plog('NOTIFY', "chroot tarball is already up-to-date"); ++ link $tmp_tar, $chroot_tar; ++ } ++ } else { ++ plog('DEBUG', "can't open $tmp_chroot/var/log/qa"); ++ plog('ERR', "can't check chroot, recreating"); ++ $rebuild = 1; ++ } ++ } + + if ($rebuild) { + if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) { +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20101126/c09547dc/attachment.html> +</PRE> + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="000958.html">[Mageia-sysadm] [154] factorize chroot rebuild code +</A></li> + <LI>Next message: <A HREF="000960.html">[Mageia-sysadm] [156] remove basesystem_media_root, basesystem_media, and use_system_distrib config options, they have no use now that we don' t need a repository tree to check if chroot is up-to-date +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#959">[ date ]</a> + <a href="thread.html#959">[ thread ]</a> + <a href="subject.html#959">[ subject ]</a> + <a href="author.html#959">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm +mailing list</a><br> +</body></html> |