From 3e192cbb9040e0b403c3803a3bf4cb62d1dc016a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Jul 2009 11:37:47 +0000 Subject: [PATCH] * Support showing the contents of ISO images (using isoinfo in cdrkit). --- release.nix | 2 +- src/lib/Hydra/Controller/Build.pm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/release.nix b/release.nix index 4142dc72..d4bd68b4 100644 --- a/release.nix +++ b/release.nix @@ -75,7 +75,7 @@ let libxslt sqlite subversion openssh nix coreutils findutils gzip bzip2 lzma gnutar unzip gnused graphviz - rpm dpkg + rpm dpkg cdrkit ]); installPhase = '' diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm index 10a8a4a5..2ce5e845 100644 --- a/src/lib/Hydra/Controller/Build.pm +++ b/src/lib/Hydra/Controller/Build.pm @@ -207,6 +207,11 @@ sub contents : Chained('build') PathPart Args(1) { error($c, "`unzip' error: $?") if $? != 0; } + elsif ($path =~ /\.iso$/ ) { + $res = `isoinfo -d -i "$path" && isoinfo -l -R -i "$path"`; + error($c, "`isoinfo' error: $?") if $? != 0; + } + else { error($c, "Unsupported file type."); }