--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package qcontrol
The fix in +wheezy1 (unblock request #694267) was incomplete because it relied
on the --direct flag which was only present in the version of qcontrol in sid.
This new upload back ports that option, which will really close #693263 693263
in testing.
unblock qcontrol/0.4.2-7+wheezy2
debdiff is:
diff -u qcontrol-0.4.2/debian/changelog qcontrol-0.4.2/debian/changelog
--- qcontrol-0.4.2/debian/changelog
+++ qcontrol-0.4.2/debian/changelog
@@ -1,3 +1,10 @@
+qcontrol (0.4.2-7+wheezy2) testing; urgency=low
+
+ * Backport --direct support, this is needed by the watchdog fix in the
+ previous release. (Closes: #693263)
+
+ -- Ian Campbell <ijc@hellion.org.uk> Sun, 06 Jan 2013 17:25:22 +0000
+
qcontrol (0.4.2-7+wheezy1) testing; urgency=low
* Disable firmware watchdog on TS-219p II and TS-419p II. (Closes: #693263)
diff -u qcontrol-0.4.2/debian/patches/series qcontrol-0.4.2/debian/patches/series
--- qcontrol-0.4.2/debian/patches/series
+++ qcontrol-0.4.2/debian/patches/series
@@ -7,0 +8 @@
+direct.patch
diff -u qcontrol-0.4.2/debian/udeb/qcommand qcontrol-0.4.2/debian/udeb/qcommand
--- qcontrol-0.4.2/debian/udeb/qcommand
+++ qcontrol-0.4.2/debian/udeb/qcommand
@@ -15,29 +15,6 @@
[ "$1" = "-t" ] && exit 1 || exit 0 ;;
esac
-# qcontrol should not be running already; silently exit
-[ -z "$(pidof qcontrol)" ] || exit 0
-
-SOCKET=/var/run/qcontrol.sock
-
-qcontrol_start() {
- rm -f $SOCKET
- qcontrol -d >/dev/null &
- # allow time to startup (read config)
- sleep 1
- pid=$(pidof qcontrol)
-
- if [ "$pid" ]; then
- if [ -S $SOCKET ]; then
- echo $pid
- return 0
- else
- kill -TERM $pid
- fi
- fi
- return 1
-}
-
# The gpio_keys character device is required with the default
# Debian configuration file.
test_event_dev() {
@@ -53,12 +30,7 @@
test_event_dev || exit 0
-if pid=$(qcontrol_start); then
- # Returns 1 even on success
- qcontrol "$@" || true
- # Kill the control process
- kill -TERM $pid
- rm -f $SOCKET
-fi
+# Returns 1 even on success (TODO: is that still true?)
+qcontrol --direct "$@" || true
exit 0
only in patch2:
unchanged:
--- qcontrol-0.4.2.orig/debian/patches/direct.patch
+++ qcontrol-0.4.2/debian/patches/direct.patch
@@ -0,0 +1,15 @@
+Index: qcontrol/qcontrol.c
+===================================================================
+--- qcontrol.orig/qcontrol.c 2012-12-29 15:07:43.000000000 +0000
++++ qcontrol/qcontrol.c 2012-12-29 15:09:49.000000000 +0000
+@@ -440,6 +440,10 @@
+ /* Startup in daemon mode */
+ pic_lua_setup(&lua);
+ return network_listen();
++ } else if (argc > 2 && strcmp(argv[1], "--direct") == 0) {
++ /* Execute a single command and terminate */
++ pic_lua_setup(&lua);
++ return run_command(argv[2], argc - 3, argv + 3);
+ } else if (argc > 1) {
+ /* Send the command to the server */
+ return network_send(argc - 1, argv + 1);
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'stable-updates'), (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
--- End Message ---
--- Begin Message ---
On 2013-01-21 21:12, Cyril Brulebois wrote:
> Adam D. Barratt <adam@adam-barratt.org.uk> (06/01/2013):
>> Thanks. It looks okay to me, but then so did the previous
>> versions. :-( Doing the CC-for-a-d-i-ack too in case there are any
>> comments from that side.
>
> AFAICT from the comments, can't be worse than without that patch, so
> let's get that in for rc1…
>
> Also, sorry for the lag, really.
>
> Mraw,
> KiBi.
Approved and (udeb) unblocked.
~Niels
--- End Message ---