[Pkg-libvirt-commits] [libvirt] 05/10: Fix typos

Guido Guenther agx at moszumanska.debian.org
Thu Jan 19 18:55:16 UTC 2017


This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch debian/experimental
in repository libvirt.

commit 7baa0daf8b104fa9b8dafd70dd9ec4bdd9ccee5a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jan 19 17:58:33 2017 +0100

    Fix typos
    
    Git-Dch: Ignore
---
 debian/patches/openpty-Skip-test-if-no-pty-is-available.patch       | 4 ++--
 debian/patches/series                                               | 2 +-
 ...on-EPERM.patch => test-posix_openpt-don-t-fail-on-EACCESS.patch} | 6 +++---
 debian/po/de.po                                                     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/openpty-Skip-test-if-no-pty-is-available.patch b/debian/patches/openpty-Skip-test-if-no-pty-is-available.patch
index f3ad289..ddf058d 100644
--- a/debian/patches/openpty-Skip-test-if-no-pty-is-available.patch
+++ b/debian/patches/openpty-Skip-test-if-no-pty-is-available.patch
@@ -10,7 +10,7 @@ on Linux.
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/gnulib/tests/test-openpty.c b/gnulib/tests/test-openpty.c
-index 2858d50..004e2d6 100644
+index 2858d50..603c5f2 100644
 --- a/gnulib/tests/test-openpty.c
 +++ b/gnulib/tests/test-openpty.c
 @@ -25,6 +25,7 @@
@@ -27,7 +27,7 @@ index 2858d50..004e2d6 100644
          {
 -          fprintf (stderr, "openpty returned %d\n", res);
 -          return 1;
-+          if (errno != ENENT) {
++          if (errno != ENOENT) {
 +            fprintf (stderr, "openpty returned %d: %s\n", res, strerror(errno));
 +            return 1;
 +          } else {
diff --git a/debian/patches/series b/debian/patches/series
index dea127f..4f1c224 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,4 +16,4 @@ virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
 Set-defaults-for-zfs-tools.patch
 Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
 openpty-Skip-test-if-no-pty-is-available.patch
-test-posix_openpt-don-t-fail-on-EPERM.patch
+test-posix_openpt-don-t-fail-on-EACCESS.patch
diff --git a/debian/patches/test-posix_openpt-don-t-fail-on-EPERM.patch b/debian/patches/test-posix_openpt-don-t-fail-on-EACCESS.patch
similarity index 83%
rename from debian/patches/test-posix_openpt-don-t-fail-on-EPERM.patch
rename to debian/patches/test-posix_openpt-don-t-fail-on-EACCESS.patch
index d7ec852..0d6772a 100644
--- a/debian/patches/test-posix_openpt-don-t-fail-on-EPERM.patch
+++ b/debian/patches/test-posix_openpt-don-t-fail-on-EACCESS.patch
@@ -1,6 +1,6 @@
 From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
 Date: Thu, 19 Jan 2017 17:19:38 +0100
-Subject: test-posix_openpt: don't fail on EPERM
+Subject: test-posix_openpt: don't fail on EACCESS
 
 In chroots created for Debian package builds created by pbuilder
 /dev/ptmx might not be accessible.
@@ -9,7 +9,7 @@ In chroots created for Debian package builds created by pbuilder
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gnulib/tests/test-posix_openpt.c b/gnulib/tests/test-posix_openpt.c
-index 87243b2..9bd7db4 100644
+index 87243b2..045640f 100644
 --- a/gnulib/tests/test-posix_openpt.c
 +++ b/gnulib/tests/test-posix_openpt.c
 @@ -43,7 +43,7 @@ main (void)
@@ -17,7 +17,7 @@ index 87243b2..9bd7db4 100644
    /* Open the master of a pseudo-terminal pair.  */
    master = posix_openpt (O_RDWR | O_NOCTTY);
 -  if (master < 0 && errno == ENOSYS)
-+  if (master < 0 && (errno == ENOSYS || errno == EPERM))
++  if (master < 0 && (errno == ENOSYS || errno == EACCES))
      {
        fputs ("skipping: platform lacks pty support\n", stderr);
        return 77;
diff --git a/debian/po/de.po b/debian/po/de.po
index 9dfd891..b3916ca 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -48,7 +48,7 @@ msgid ""
 msgstr ""
 " Um Gäste mit Image Dateien die via NFS verteilt werden zu migrieren wird\n"
 " eine identische libvirt-qemu Nutzer and Gruppen ID zwischen Quell- und\n"
-" Ziel Host System benötigt.".
+" Ziel Host System benötigt."
 
 #. Type: boolean
 #. Description

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git



More information about the Pkg-libvirt-commits mailing list