[Python-apps-commits] r10799 - in packages/slapos.core/trunk/debian (3 files)

[arnau at users.alioth.debian.org]

    Date: Saturday, April 26, 2014 @ 09:37:55
  Author: arnau
Revision: 10799

Upload slapos.core 1.0.3-2.

Added:
  packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch
Modified:
  packages/slapos.core/trunk/debian/changelog
  packages/slapos.core/trunk/debian/patches/series

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2014-04-26 09:29:26 UTC (rev 10798)
+++ packages/slapos.core/trunk/debian/changelog	2014-04-26 09:37:55 UTC (rev 10799)
@@ -1,3 +1,10 @@
+slapos.core (1.0.3-2) unstable; urgency=medium
+
+  * debian/patches/fix_static_opt_path.patch:
+    + Fix static '/opt/' path.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Thu, 24 Apr 2014 16:17:51 +0900
+
 slapos.core (1.0.3-1) unstable; urgency=medium
 
   * New upstream release.

Added: packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch	                        (rev 0)
+++ packages/slapos.core/trunk/debian/patches/fix_static_opt_path.patch	2014-04-26 09:37:55 UTC (rev 10799)
@@ -0,0 +1,15 @@
+Author: Arnaud Fontaine <arnau at debian.org>
+Forwarded: not-needed
+Description: Fix hardcoded slapos-watchdog path
+
+--- a/slapos/grid/slapgrid.py
++++ b/slapos/grid/slapgrid.py
+@@ -68,7 +68,7 @@
+ PROMISE_TIMEOUT = 3
+ 
+ # XXX hardcoded watchdog_path
+-WATCHDOG_PATH = '/opt/slapos/bin/slapos-watchdog'
++WATCHDOG_PATH = '/usr/sbin/slapos-watchdog'
+ 
+ COMPUTER_PARTITION_TIMESTAMP_FILENAME = '.timestamp'
+ COMPUTER_PARTITION_LATEST_BANG_TIMESTAMP_FILENAME = '.slapos_latest_bang_timestamp'

Modified: packages/slapos.core/trunk/debian/patches/series
===================================================================
--- packages/slapos.core/trunk/debian/patches/series	2014-04-26 09:29:26 UTC (rev 10798)
+++ packages/slapos.core/trunk/debian/patches/series	2014-04-26 09:37:55 UTC (rev 10799)
@@ -1,2 +1,3 @@
 system_configuration_file_by_default.patch
 slapos_command_split_up.patch
+fix_static_opt_path.patch