[libvirt] [PATCH] po: fix POTFILES.in file ordering

Erik Skultety eskultet at redhat.com
Sat Apr 9 18:10:55 UTC 2016 

When it comes to a situation that a new translatable file needs to be added
into the list of files, an automatically generated patch is proposed during
syntax-check. However, the diff was made against a sorted list of files and
the same sorted list of files + the new file that actually needs to be added
into the list. Since we do not keep POTFILES sorted, the proposed patch thus
can't be applied...most of the time - depending on the context.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 po/POTFILES.in | 68 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 21d4cc6..dfc2ac2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
-daemon/admin_dispatch.h
 daemon/admin.c
-daemon/libvirtd-config.c
+daemon/admin_dispatch.h
 daemon/libvirtd.c
+daemon/libvirtd-config.c
 daemon/qemu_dispatch.h
 daemon/remote.c
 daemon/remote_dispatch.h
@@ -26,8 +26,8 @@ src/conf/interface_conf.c
 src/conf/netdev_bandwidth_conf.c
 src/conf/netdev_vlan_conf.c
 src/conf/netdev_vport_profile_conf.c
-src/conf/network_conf.c
 src/conf/networkcommon_conf.c
+src/conf/network_conf.c
 src/conf/node_device_conf.c
 src/conf/numa_conf.c
 src/conf/nwfilter_conf.c
@@ -61,18 +61,22 @@ src/hyperv/hyperv_wmi.c
 src/interface/interface_backend_netcf.c
 src/interface/interface_backend_udev.c
 src/internal.h
-src/libvirt.c
 src/libvirt-admin.c
+src/libvirt.c
 src/libvirt-domain.c
 src/libvirt-domain-snapshot.c
 src/libvirt-host.c
 src/libvirt-lxc.c
 src/libvirt-network.c
 src/libvirt-nwfilter.c
+src/libvirt-qemu.c
 src/libvirt-secret.c
 src/libvirt-storage.c
 src/libvirt-stream.c
-src/libvirt-qemu.c
+src/libxl/libxl_conf.c
+src/libxl/libxl_domain.c
+src/libxl/libxl_driver.c
+src/libxl/libxl_migration.c
 src/locking/lock_daemon.c
 src/locking/lock_daemon_config.c
 src/locking/lock_daemon_dispatch.c
@@ -86,19 +90,15 @@ src/logging/log_daemon_dispatch.c
 src/logging/log_handler.c
 src/logging/log_manager.c
 src/lxc/lxc_cgroup.c
-src/lxc/lxc_fuse.c
-src/lxc/lxc_hostdev.c
-src/lxc/lxc_native.c
-src/lxc/lxc_container.c
 src/lxc/lxc_conf.c
+src/lxc/lxc_container.c
 src/lxc/lxc_controller.c
 src/lxc/lxc_domain.c
 src/lxc/lxc_driver.c
+src/lxc/lxc_fuse.c
+src/lxc/lxc_hostdev.c
+src/lxc/lxc_native.c
 src/lxc/lxc_process.c
-src/libxl/libxl_domain.c
-src/libxl/libxl_driver.c
-src/libxl/libxl_conf.c
-src/libxl/libxl_migration.c
 src/network/bridge_driver.c
 src/network/bridge_driver_linux.c
 src/network/leaseshelper.c
@@ -114,10 +114,6 @@ src/nwfilter/nwfilter_learnipaddr.c
 src/openvz/openvz_conf.c
 src/openvz/openvz_driver.c
 src/openvz/openvz_util.c
-src/vz/vz_driver.c
-src/vz/vz_sdk.c
-src/vz/vz_utils.c
-src/vz/vz_utils.h
 src/phyp/phyp_driver.c
 src/qemu/qemu_agent.c
 src/qemu/qemu_alias.c
@@ -125,8 +121,8 @@ src/qemu/qemu_capabilities.c
 src/qemu/qemu_cgroup.c
 src/qemu/qemu_command.c
 src/qemu/qemu_conf.c
-src/qemu/qemu_domain.c
 src/qemu/qemu_domain_address.c
+src/qemu/qemu_domain.c
 src/qemu/qemu_driver.c
 src/qemu/qemu_hostdev.c
 src/qemu/qemu_hotplug.c
@@ -146,12 +142,12 @@ src/rpc/virnetclientstream.c
 src/rpc/virnetdaemon.c
 src/rpc/virnetmessage.c
 src/rpc/virnetsaslcontext.c
-src/rpc/virnetsocket.c
 src/rpc/virnetserver.c
 src/rpc/virnetserverclient.c
 src/rpc/virnetservermdns.c
 src/rpc/virnetserverprogram.c
 src/rpc/virnetserverservice.c
+src/rpc/virnetsocket.c
 src/rpc/virnetsshsession.c
 src/rpc/virnettlscontext.c
 src/secret/secret_driver.c
@@ -209,9 +205,9 @@ src/util/virkeyfile.c
 src/util/virlease.c
 src/util/virlockspace.c
 src/util/virlog.c
-src/util/virnetdev.c
 src/util/virnetdevbandwidth.c
 src/util/virnetdevbridge.c
+src/util/virnetdev.c
 src/util/virnetdevmacvlan.c
 src/util/virnetdevmidonet.c
 src/util/virnetdevopenvswitch.c
@@ -230,8 +226,8 @@ src/util/virportallocator.c
 src/util/virprocess.c
 src/util/virrandom.c
 src/util/virrotatingfile.c
-src/util/virsexpr.c
 src/util/virscsi.c
+src/util/virsexpr.c
 src/util/virsocketaddr.c
 src/util/virstats.c
 src/util/virstorageencryption.c
@@ -246,36 +242,40 @@ src/util/viruri.c
 src/util/virusb.c
 src/util/virutil.c
 src/util/virxml.c
-src/vbox/vbox_MSCOMGlue.c
-src/vbox/vbox_XPCOMCGlue.c
-src/vbox/vbox_driver.c
 src/vbox/vbox_common.c
+src/vbox/vbox_driver.c
+src/vbox/vbox_MSCOMGlue.c
 src/vbox/vbox_network.c
-src/vbox/vbox_storage.c
 src/vbox/vbox_snapshot_conf.c
+src/vbox/vbox_storage.c
 src/vbox/vbox_tmpl.c
+src/vbox/vbox_XPCOMCGlue.c
 src/vmware/vmware_conf.c
 src/vmware/vmware_driver.c
 src/vmx/vmx.c
-src/xen/block_stats.c
-src/xen/xen_driver.c
-src/xen/xen_hypervisor.c
-src/xen/xen_inotify.c
-src/xen/xend_internal.c
-src/xen/xm_internal.c
-src/xen/xs_internal.c
+src/vz/vz_driver.c
+src/vz/vz_sdk.c
+src/vz/vz_utils.c
+src/vz/vz_utils.h
 src/xenapi/xenapi_driver.c
 src/xenapi/xenapi_utils.c
+src/xen/block_stats.c
 src/xenconfig/xen_common.c
 src/xenconfig/xen_sxpr.c
 src/xenconfig/xen_xl.c
 src/xenconfig/xen_xm.c
+src/xen/xend_internal.c
+src/xen/xen_driver.c
+src/xen/xen_hypervisor.c
+src/xen/xen_inotify.c
+src/xen/xm_internal.c
+src/xen/xs_internal.c
 tests/virpolkittest.c
 tools/libvirt-guests.sh.in
 tools/virsh.c
 tools/virsh-console.c
-tools/virsh-domain-monitor.c
 tools/virsh-domain.c
+tools/virsh-domain-monitor.c
 tools/virsh-edit.c
 tools/virsh-host.c
 tools/virsh-interface.c
@@ -287,10 +287,10 @@ tools/virsh-secret.c
 tools/virsh-snapshot.c
 tools/virsh-volume.c
 tools/virt-admin.c
+tools/virt-host-validate.c
 tools/virt-host-validate-common.c
 tools/virt-host-validate-lxc.c
 tools/virt-host-validate-qemu.c
-tools/virt-host-validate.c
 tools/virt-login-shell.c
 tools/vsh.c
 tools/vsh.h
-- 
2.4.11

More information about the libvir-list mailing list