[PATCH] po: avoid spurious double spaces in messages

[Eric Blake <eblake@xxxxxxxxxx>]

Noticed during the recent error cleanups.

* src/network/bridge_driver.c (networkStartRadvd): Fix spacing.
* src/openvz/openvz_conf.c (openvzReadMemConf): Likewise.
* src/qemu/qemu_command.c (qemuNetworkIfaceConnect): Likewise.
* src/qemu/qemu_hotplug.c (qemuDomainDetachNetDevice): Likewise.
* src/qemu/qemu_process.c (qemuProcessStop): Likewise.
* src/security/virt-aa-helper.c (vah_add_file): Likewise.
---

Pushing under the trivial rule.

 src/network/bridge_driver.c   |    2 +-
 src/openvz/openvz_conf.c      |    2 +-
 src/qemu/qemu_command.c       |    2 +-
 src/qemu/qemu_hotplug.c       |    2 +-
 src/qemu/qemu_process.c       |    2 +-
 src/security/virt-aa-helper.c |    8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 9b1964b..5bf1412 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -850,7 +850,7 @@ networkStartRadvd(virNetworkObjPtr network)
         prefix = virNetworkIpDefPrefix(ipdef);
         if (prefix < 0) {
             networkReportError(VIR_ERR_INTERNAL_ERROR,
-                               _("bridge  '%s' has an invalid prefix"),
+                               _("bridge '%s' has an invalid prefix"),
                                network->def->bridge);
             goto cleanup;
         }
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index bc54012..57479d4 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -511,7 +511,7 @@ openvzReadMemConf(virDomainDefPtr def, int veid)
         ret = openvzParseBarrierLimit(temp, &barrier, NULL);
         if (ret < 0) {
             openvzError(VIR_ERR_INTERNAL_ERROR,
-                        _("Could not parse  barrier of '%s' "
+                        _("Could not parse barrier of '%s' "
                           "from config for container %d"), param, veid);
             goto error;
         }
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 09215af..4013740 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -265,7 +265,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def,
     if (driver->macFilter) {
         if ((err = networkAllowMacOnPort(driver, net->ifname, &net->mac))) {
             virReportSystemError(err,
-                 _("failed to add ebtables rule to allow MAC address on  '%s'"),
+                 _("failed to add ebtables rule to allow MAC address on '%s'"),
                                  net->ifname);
         }
     }
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 09c8c97..5a9a6f7 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2293,7 +2293,7 @@ qemuDomainDetachNetDevice(struct qemud_driver *driver,
                                               detach->ifname,
                                               &detach->mac))) {
             virReportSystemError(errno,
-             _("failed to remove ebtables rule on  '%s'"),
+             _("failed to remove ebtables rule on '%s'"),
                                  detach->ifname);
         }
     }
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d8169e8..b260a20 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4029,7 +4029,7 @@ void qemuProcessStop(struct qemud_driver *driver,
             if ((errno = networkDisallowMacOnPort(driver, net->ifname,
                                                   &net->mac))) {
                 virReportSystemError(errno,
-             _("failed to remove ebtables rule to allow MAC address on  '%s'"),
+             _("failed to remove ebtables rule to allow MAC address on '%s'"),
                                      net->ifname);
             }
         }
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 7b41d38..056362c 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -2,7 +2,7 @@
 /*
  * virt-aa-helper: wrapper program used by AppArmor security driver.
  *
- * Copyright (C) 2010-2011 Red Hat, Inc.
+ * Copyright (C) 2010-2012 Red Hat, Inc.
  * Copyright (C) 2009-2011 Canonical Ltd.
  *
  * See COPYING.LIB for the License of this software
@@ -762,14 +762,14 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms)
      */
     if (STRNEQLEN(path, "/", 1)) {
         vah_warning(path);
-        vah_warning(_("  skipped non-absolute path"));
+        vah_warning(_("skipped non-absolute path"));
         return 0;
     }

     if (virFileExists(path)) {
         if ((tmp = realpath(path, NULL)) == NULL) {
             vah_error(NULL, 0, path);
-            vah_error(NULL, 0, _("  could not find realpath for disk"));
+            vah_error(NULL, 0, _("could not find realpath for disk"));
             return rc;
         }
     } else
@@ -783,7 +783,7 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms)
     if (rc != 0) {
         if (rc > 0) {
             vah_error(NULL, 0, path);
-            vah_error(NULL, 0, _("  skipped restricted file"));
+            vah_error(NULL, 0, _("skipped restricted file"));
         }
         goto clean;
     }
-- 
1.7.10.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list