Bug#797710: (no subject)
Subject: jessie-pu: package ben/0.7.0
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: pu
Tags: jessie
Severity: normal
Hi,
I'd like to fix a few issues in Ben:
- Semi-broken HTML links to buildd status pages (compact parameter
not taken into account)
- Fix broken call to dose-debcheck which results into Ben not
getting installability issues right. This issue has been filed
against dose-distcheck as #770802. The fix is to pass --deb-native-arch=$arch
to dose-debcheck and parse output correctly.
- Ignore potential errors when deleting lock file.
I am attaching a debdiff with the proposed changes.
These bugs have been found after upgrading release.debian.org to
Jessie. Ben has been running there with those fixes since then.
All Best,
-- System Information:
Debian Release: 8.1
APT prefers stable
APT policy: (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog
index 0347597..266fc68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ben (0.7.0+deb8u1) jessie; urgency=medium
+
+ [ Emilio Pozuelo Monfort ]
+ * Fix buildd.debian.org compact links
+
+ [ Mehdi Dogguy ]
+ * Ignore potential errors when deleting lock file
+ * Call dose-debcheck with --deb-native-arch
+
+ -- Mehdi Dogguy <mehdi@debian.org> Tue, 01 Sep 2015 21:30:42 +0000
+
ben (0.7.0) unstable; urgency=medium
* Add --no-clean to "ben tracker" to leave unknown generated
diff --git a/frontends/ben_tracker.ml b/frontends/ben_tracker.ml
index f52c0c2..6d6bd99 100644
--- a/frontends/ben_tracker.ml
+++ b/frontends/ben_tracker.ml
@@ -445,7 +445,9 @@ let tracker template profiles =
Benl_error.error_exn "Failed to generate index.html" exn
let () = at_exit (fun () ->
- rm [lockf ()]
+ try
+ rm [lockf ()]
+ with _ -> ()
)
let main args =
diff --git a/lib/benl_data.ml b/lib/benl_data.ml
index fabe51a..856a609 100644
--- a/lib/benl_data.ml
+++ b/lib/benl_data.ml
@@ -322,6 +322,13 @@ let read_debcheck =
let () = Buffer.reset buf in
r
in
+ let get_package_name p =
+ let p = Re_pcre.get_substring p 1 in
+ try
+ snd (ExtString.String.split p ":")
+ with _ ->
+ p
+ in
let rec read_pkg accu =
begin match (try Some (input_line ic) with End_of_file -> None) with
| None ->
@@ -329,7 +336,7 @@ let read_debcheck =
| Some line ->
try
let r = Re_pcre.exec ~rex line in
- let package = Re_pcre.get_substring r 1 in
+ let package = get_package_name r in
let buf = Buffer.create 1024 in
let () = Buffer.add_string buf line in
let () = Buffer.add_char buf '\n' in
@@ -360,7 +367,8 @@ let inject_debcheck_data =
let a, b = if !Benl_clflags.quiet then ("\n", "") else ("", "\n") in
let all_uninstallable_packages = Benl_parallel.fold (fun map arch_ref ->
Benl_clflags.progress "Running dose-debcheck on %s...\n" arch_ref;
- let (ic, oc) as p = Unix.open_process "dose-debcheck --explain --quiet --failures" in
+ let dose_debcheck_cmd = Printf.sprintf "dose-debcheck --deb-native-arch=%s --explain --quiet --failures" arch_ref in
+ let (ic, oc) as p = Unix.open_process dose_debcheck_cmd in
(* inefficiency: for each architecture, we iterate on all binary
packages, not only on binary packages of said architectures *)
PAMap.iter (fun (name, arch) pkg ->
diff --git a/templates/debian.ml b/templates/debian.ml
index 77c62cb..0bd3c0b 100644
--- a/templates/debian.ml
+++ b/templates/debian.ml
@@ -43,7 +43,7 @@ let () =
buildd = (fun ~src ~ver -> sprintf "https://buildd.debian.org/status/package.php?p=%s"; src);
buildds = (fun ~srcs ->
let srcs = String.concat "," srcs in
- Some (sprintf "https://buildd.debian.org/status/package.php?p=%s&compact=compact"; srcs));
+ Some (sprintf "https://buildd.debian.org/status/package.php?p=%s&compact=compact"; srcs));
bugs = (fun ~src -> sprintf "http://bugs.debian.org/%s"; src);
critical_bugs = (fun ~srcs ->
let srcs = String.concat ";src=" srcs in
diff --git a/templates/debianrt.ml b/templates/debianrt.ml
index 0b29532..5dcdf7d 100644
--- a/templates/debianrt.ml
+++ b/templates/debianrt.ml
@@ -56,7 +56,7 @@ let () =
buildd = (fun ~src ~ver -> sprintf "https://buildd.debian.org/status/package.php?p=%s"; src);
buildds = (fun ~srcs ->
let srcs = String.concat "," srcs in
- Some (sprintf "https://buildd.debian.org/status/package.php?p=%s&compact=compact"; srcs));
+ Some (sprintf "https://buildd.debian.org/status/package.php?p=%s&compact=compact"; srcs));
bugs = (fun ~src -> sprintf "http://bugs.debian.org/%s"; src);
critical_bugs = (fun ~srcs ->
let srcs = String.concat ";src=" srcs in
Reply to: