[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#686656: unblock nova/2012.1.1-9



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package nova

  * Fix a bug introduced in version 2011.1.1-4 that breaks the package upgrade (the daemon no longer runs)
  * Added Debconf Chinese translation thanks to ben <duyujie.dyj@gmail.com>.

Please find the debdiff between -8 and -9 attached to this mail.

$ diffstat /tmp/8-9.patch 
 changelog         |   16 +++++++
 nova-compute.init |    2 
 po/zh_CN.po       |  121 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 138 insertions(+), 1 deletion(-)

Cheers



diff -Nru nova-2012.1.1/debian/changelog nova-2012.1.1/debian/changelog
--- nova-2012.1.1/debian/changelog	2012-08-24 07:30:59.000000000 +0200
+++ nova-2012.1.1/debian/changelog	2012-09-03 13:51:08.000000000 +0200
@@ -1,3 +1,19 @@
+nova (2012.1.1-9) unstable; urgency=low
+
+  [ Thomas Goirand ]
+  * Added Debconf Chinese translation thanks to ben <duyujie.dyj@gmail.com>.
+
+  [ Loic Dachary (OuoU) ]
+  * revert to using --flagfile instead of --config-file in
+    nova-compute.init because --flagfile supports both configuration file
+    formats. Using --config-file forces to use the newest configuration
+    file format and is not backward compatible. If upgrading from
+    nova-compute-2012.1.1-4 to all versions until nova-compute-2012.1.1-8
+    when using the old format in nova.conf, nova-compute will no longer
+    run. It will silently fail to parse the older format and abort.
+  
+ -- Loic Dachary (OuoU) <loic@debian.org>  Mon, 03 Sep 2012 13:24:09 +0200
+
 nova (2012.1.1-8) unstable; urgency=low
 
   * Corrected wrong encoding in the it.po (Closes: #685576).
diff -Nru nova-2012.1.1/debian/nova-compute.init nova-2012.1.1/debian/nova-compute.init
--- nova-2012.1.1/debian/nova-compute.init	2012-08-24 07:30:59.000000000 +0200
+++ nova-2012.1.1/debian/nova-compute.init	2012-09-03 13:51:08.000000000 +0200
@@ -19,7 +19,7 @@
 DESC="OpenStack Compute"
 NAME=nova-compute
 DAEMON=/usr/bin/nova-compute
-DAEMON_ARGS="--config-file=/etc/nova/nova.conf"
+DAEMON_ARGS="--flagfile=/etc/nova/nova.conf"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 NOVA_USER=nova
diff -Nru nova-2012.1.1/debian/po/zh_CN.po nova-2012.1.1/debian/po/zh_CN.po
--- nova-2012.1.1/debian/po/zh_CN.po	1970-01-01 01:00:00.000000000 +0100
+++ nova-2012.1.1/debian/po/zh_CN.po	2012-09-03 13:51:08.000000000 +0200
@@ -0,0 +1,121 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nova\n"
+"Report-Msgid-Bugs-To: nova@packages.debian.org\n"
+"POT-Creation-Date: 2012-06-25 10:00+0000\n"
+"PO-Revision-Date: 2012-08-27 16:48+0800\n"
+"Last-Translator: ben <duyujie.dyj@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../nova-common.templates:2001
+msgid "Start nova services at boot?"
+msgstr "ç³»ç»?å?¯å?¨æ?¶å?¯å?¨novaæ??å?¡ï¼?"
+
+#. Type: boolean
+#. Description
+#: ../nova-common.templates:2001
+msgid "Please choose whether you want to start Nova services when the machine is booted up."
+msgstr "请é??æ?©æ?¯å?¦é??è¦?å?¨æ?ºå?¨å?¯å?¨æ?¶å?¯å?¨Novaæ??å?¡ã??"
+
+#. Type: boolean
+#. Description
+#: ../nova-common.templates:3001
+msgid "Set up a database for Nova?"
+msgstr "为Nova设置����"
+
+#. Type: boolean
+#. Description
+#: ../nova-common.templates:3001
+msgid "No database has been set up for Nova to use. If you want to set one up now, please make sure you have all needed information:"
+msgstr "æ?ªæ?¾ä¸ºNova设置æ?°æ?®åº?ã??å¦?æ??ä½ å¸?æ??ç?°å?¨è®¾ç½®ï¼?请确å®?æ?¨æ??以ä¸?ä¿¡æ?¯ï¼?"
+
+#. Type: boolean
+#. Description
+#: ../nova-common.templates:3001
+msgid ""
+" * the host name of the database server (which must allow TCP\n"
+"   connections from this machine);\n"
+" * a username and password to access the database;\n"
+" * the type of database management software you want to use."
+msgstr ""
+" * æ?°æ?®åº?æ??å?¡å?¨ç??主æ?ºå?? ï¼?é??è¦?è¿?å?°ä¸»æ?ºç??TCPé?¾æ?¥ï¼?ï¼?\n"
+" * 访é?®è¿?个æ?°æ?®åº?ç??ç?¨æ?·å??å??å¯?ç ?ï¼?\n"
+" * ä½ å¸?æ??使ç?¨ç??æ?°æ?®åº?管ç??软件ç??ç±»å??ã??"
+
+#. Type: boolean
+#. Description
+#: ../nova-common.templates:3001
+msgid "If you don't choose this option, no database will be set up and Nova will use regular SQLite support."
+msgstr "å¦?æ??你没æ??é??æ?©è¯¥é¡¹ï¼?ä¸?ä¼?设置æ?°æ?®åº?并ä¸?Novaå°?ä¼?使ç?¨SQLiteã??"
+
+#. Type: boolean
+#. Description
+#: ../nova-common.templates:3001
+msgid "You can change this setting later on by running \"dpkg-reconfigure -plow nova-common\"."
+msgstr "æ?¨å?¯ä»¥é??è¿?è¿?è¡?\"dpkg-reconfigure-plow nova-common\" å?½ä»¤æ?¥ä¿®æ?¹é??ç½®ã??"
+
+#. Type: string
+#. Description
+#: ../nova-compute-xen.templates:2001
+msgid "Address of the XenAPI dom0:"
+msgstr "XenAPI dom0 å?°å??ï¼?"
+
+#. Type: string
+#. Description
+#: ../nova-compute-xen.templates:2001
+msgid "Nova Compute Xen needs to know the address of the server running XenAPI. You can enter an IP address, or a fully qualified domain name if it resolves correctly."
+msgstr "Nova Compute Xen é??è¦?ç?¥é??è¿?è¡?XenAPIç??æ??å?¡å?¨å?°å??ã??ä½ å?¯ä»¥è¾?å?¥ä¸?个IPå?°å??ï¼?æ??è??ä¸?个正确解æ??ç??å??å??ã??"
+
+#. Type: string
+#. Description
+#: ../nova-compute-xen.templates:2001
+msgid "This may be a server running Citrix XenServer, the CentOS Xen Cloud Platform (XCP) appliance installed from an ISO image, or even the Kronos Project's XCP (available in Debian and Ubuntu as the package xcp-xapi)."
+msgstr "è¿?å?¯è?½æ?¯ä¸?个è¿?è¡?Citrix XenServerç??æ??å?¡å?¨ï¼?æ??è??ä»?ä¸?个ISOé??å??å®?è£?ç??CentOS XCP(Xen Cloud Platform)åº?ç?¨ç¨?åº?ï¼?æ??è??Kronos 项ç?®ç??XCPï¼?å?¯ä»¥ä»?Debianå??Ubuntuç??xcp-xapiå??è?·å¾?ï¼?ã??"
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../nova-compute-xen.templates:2001
+#: ../nova-compute-xen.templates:3001
+#: ../nova-compute-xen.templates:4001
+msgid "This can later be edited in /etc/nova/nova-compute.conf."
+msgstr "ç¨?å??å?¯ä»¥ä¿®æ?¹é??ç½®æ??件 /etc/nova/nova-compute.confã??"
+
+#. Type: string
+#. Description
+#: ../nova-compute-xen.templates:3001
+msgid "Username to connect to XenAPI:"
+msgstr "é?¾æ?¥å?°XenAPIç??ç?¨æ?·å??ï¼?"
+
+#. Type: string
+#. Description
+#: ../nova-compute-xen.templates:3001
+msgid "Please enter the username used to connect to your XenAPI (XCP server)."
+msgstr "请è¾?å?¥é?¾æ?¥å?°æ?¨ç??XenAPIï¼?XCPæ??å?¡å?¨ï¼?ç??ç?¨æ?·å??ã??"
+
+#. Type: password
+#. Description
+#: ../nova-compute-xen.templates:4001
+msgid "Password to connect to XenAPI:"
+msgstr "é?¾æ?¥å?°XenAPIç??å¯?ç ?ï¼?"
+
+#. Type: password
+#. Description
+#: ../nova-compute-xen.templates:4001
+msgid "Please enter the password used to connect to your XenAPI (XCP server)."
+msgstr "请è¾?å?¥é?¾æ?¥å?°æ?¨ç??XenAPIï¼?XCPæ??å?¡å?¨ï¼?ç??å¯?ç ?ã??"
+
begin:vcard
fn:Loic Dachary
n:Dachary;Loic
org:Artisan Logiciel Libre
adr:;;12 bd Magenta;Paris;;75010;France
email;internet:loic@dachary.org
title:Senior Developer
tel;work:+33 4 84 25 08 05
tel;home:+33 9 51 18 43 38
tel;cell:+33 6 64 03 29 07
note:Born 131414404 before EPOCH.
url:http://dachary.org/
version:2.1
end:vcard

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: