[Parted-commits] GNU Parted Official Repository: Changes to 'master'
Jim Meyering
meyering at alioth.debian.org
Thu Oct 18 12:16:57 UTC 2012
doc/C/po/partprobe.8.pot | 59 +++++++++++++++--------------
doc/pt_BR/partprobe.8.pt_BR.po | 83 ++++++++++++++++++++++++++---------------
tests/t-lvm.sh | 23 -----------
tests/t6001-psep.sh | 8 ---
4 files changed, 89 insertions(+), 84 deletions(-)
New commits:
commit 2ab9f04692e74c8b1daae68f1c22c5723f6c39ef
Author: Brian C. Lane <bcl at redhat.com>
Date: Wed Oct 17 21:42:12 2012 +0200
tests: cleanup losetup usage
The unsafe_losetup_ function was failing because losetup didn't
recognize that the 'private' /dev/loopX devices were the same as
/dev/loopX, it would fail even if one was in use. Switch to using
losetup --show which is a cleaner solution.
Also use sparse file for loop_setup to save space.
* tests/t-lvm.sh (unsafe_losetup_): Remove function.
(loop_setup_): Use losetup's --show option instead.
Use dd with /dev/null, not /dev/zero.
* tests/t6001-psep.sh: Use loop_setup_ rather than losetup --show.
diff --git a/tests/t-lvm.sh b/tests/t-lvm.sh
index cf1b8b8..001523b 100644
--- a/tests/t-lvm.sh
+++ b/tests/t-lvm.sh
@@ -13,33 +13,14 @@
export LVM_SUPPRESS_FD_WARNINGS=1
-unsafe_losetup_()
-{
- f=$1
-
- G_dev_=/dev
-
- # Iterate through $G_dev_/loop{,/}{0,1,2,3,4,5,6,7,8,9}
- for slash in '' /; do
- for i in 0 1 2 3 4 5 6 7 8 9; do
- dev=$G_dev_/loop$slash$i
- losetup $dev 1>&2 && continue;
- losetup "$dev" "$f" > /dev/null && { echo "$dev"; return 0; }
- break
- done
- done
-
- return 1
-}
-
loop_setup_()
{
file=$1
- dd if=/dev/zero of="$file" bs=1M count=1 seek=1000 > /dev/null 2>&1 \
+ dd if=/dev/null of="$file" bs=1M count=1 seek=1000 > /dev/null 2>&1 \
|| { warn_ "loop_setup_ failed: Unable to create tmp file $file"; return 1; }
# NOTE: this requires a new enough version of losetup
- dev=$(unsafe_losetup_ "$file") \
+ dev=$(losetup --show -f "$file") \
|| { warn_ "loop_setup_ failed: Unable to create loopback device"; return 1; }
echo "$dev"
diff --git a/tests/t6001-psep.sh b/tests/t6001-psep.sh
index 490c6d2..1859ac9 100644
--- a/tests/t6001-psep.sh
+++ b/tests/t6001-psep.sh
@@ -44,14 +44,10 @@ cleanup_fn_() {
# create a file of size N bytes
N=10M
-# create the test file
-f1=$(pwd)/1; dd if=/dev/null of=$f1 bs=1 seek=$N 2> /dev/null || fail=1
-f2=$(pwd)/2; dd if=/dev/null of=$f2 bs=1 seek=$N 2> /dev/null || fail=1
-
-d1=$(loop_setup_ "$f1") \
+f1=$(pwd)/1; d1=$(loop_setup_ "$f1") \
|| skip_ "is this partition mounted with 'nodev'?"
-d2=$(loop_setup_ "$f2") \
+f2=$(pwd)/2 ;d2=$(loop_setup_ "$f2") \
|| skip_ "is this partition mounted with 'nodev'?"
dmsetup_cmd="0 `blockdev --getsz $d1` linear $d1 0"
commit d9f34625df17b30013e141516c2722b77b4b6eea
Author: Jim Meyering <jim at meyering.net>
Date: Wed Oct 17 23:07:55 2012 +0200
maint: regenerate .po, .pot files
diff --git a/doc/C/po/partprobe.8.pot b/doc/C/po/partprobe.8.pot
index 19bd79f..d061382 100644
--- a/doc/C/po/partprobe.8.pot
+++ b/doc/C/po/partprobe.8.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-02-26 06:06+0100\n"
+"POT-Creation-Date: 2012-10-17 21:43+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -93,106 +93,111 @@ msgstr ""
msgid "This manual page documents briefly the B<partprobe> command."
msgstr ""
-# type: Plain text
#. TeX users may be more comfortable with the \fB<whatever>\fP and
#. \fI<whatever>\fP escape sequences to invode bold face and italics,
#. respectively.
#. type: Plain text
-#: partprobe.8:36
+#: partprobe.8:35
msgid ""
"B<partprobe> is a program that informs the operating system kernel of "
-"partition table changes, by requesting that the operating system re-read the "
-"partition table."
+"partition table changes."
msgstr ""
# type: SH
#. type: SH
-#: partprobe.8:36
+#: partprobe.8:35
#, no-wrap
msgid "OPTIONS"
msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:38
+#: partprobe.8:37
msgid "This program uses short UNIX style options."
msgstr ""
-# type: TP
#. type: TP
-#: partprobe.8:38
+#: partprobe.8:37
#, no-wrap
-msgid "B<-d>"
+msgid "B<-d, --dry-run>"
msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:41
+#: partprobe.8:40
msgid "Don't update the kernel."
msgstr ""
-# type: TP
#. type: TP
-#: partprobe.8:41
+#: partprobe.8:40
#, no-wrap
-msgid "B<-s>"
+msgid "B<-s, --summary>"
msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:44
+#: partprobe.8:43
msgid "Show a summary of devices and their partitions."
msgstr ""
-# type: TP
#. type: TP
-#: partprobe.8:44
+#: partprobe.8:43
#, no-wrap
-msgid "B<-h>"
+msgid "B<-h, --help>"
msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:47
+#: partprobe.8:46
msgid "Show summary of options."
msgstr ""
-# type: TP
#. type: TP
-#: partprobe.8:47
+#: partprobe.8:46
#, no-wrap
-msgid "B<-v>"
+msgid "B<-v, --version>"
msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:50
+#: partprobe.8:49
msgid "Show version of program."
msgstr ""
+#. type: SH
+#: partprobe.8:49
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr ""
+
+#. type: Plain text
+#: partprobe.8:51
+msgid "Report bugs to E<lt>bug-parted at gnu.orgE<gt>"
+msgstr ""
+
# type: SH
#. type: SH
-#: partprobe.8:50
+#: partprobe.8:51
#, no-wrap
msgid "SEE ALSO"
msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:52
+#: partprobe.8:53
msgid "B<parted>(8)."
msgstr ""
# type: SH
#. type: SH
-#: partprobe.8:52
+#: partprobe.8:53
#, no-wrap
msgid "AUTHOR"
msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:54
+#: partprobe.8:55
msgid ""
"This manual page was written by Timshel Knoll E<lt>timshel at debian.orgE<gt>, "
"for the Debian GNU/Linux system (but may be used by others)."
diff --git a/doc/pt_BR/partprobe.8.pt_BR.po b/doc/pt_BR/partprobe.8.pt_BR.po
index ffa47d7..4870d09 100644
--- a/doc/pt_BR/partprobe.8.pt_BR.po
+++ b/doc/pt_BR/partprobe.8.pt_BR.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-02-26 06:06+0100\n"
+"POT-Creation-Date: 2012-10-17 21:43+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Tassia Camoes Araujo <tassia at debian-ba.org>\n"
"Language-Team: l10n portuguese <debian-l10n-portuguese at lists.debian.org>\n"
@@ -100,11 +100,11 @@ msgstr "Esta página de manual documenta brevemente o comando B<partprobe>"
#. \fI<whatever>\fP escape sequences to invode bold face and italics,
#. respectively.
#. type: Plain text
-#: partprobe.8:36
+#: partprobe.8:35
+#, fuzzy
msgid ""
"B<partprobe> is a program that informs the operating system kernel of "
-"partition table changes, by requesting that the operating system re-read the "
-"partition table."
+"partition table changes."
msgstr ""
"B<partprobe> é uma programa que informa ao kernel do sistema operacional "
"sobre mudanças na tabela de partição, requisitando que o sistema operacional "
@@ -112,95 +112,118 @@ msgstr ""
# type: SH
#. type: SH
-#: partprobe.8:36
+#: partprobe.8:35
#, no-wrap
msgid "OPTIONS"
msgstr "OPÇÕES"
# type: Plain text
#. type: Plain text
-#: partprobe.8:38
+#: partprobe.8:37
msgid "This program uses short UNIX style options."
msgstr "Este programa usa opções de estilo curtas do UNIX."
-# type: TP
#. type: TP
-#: partprobe.8:38
+#: partprobe.8:37
#, no-wrap
-msgid "B<-d>"
-msgstr "B<-d>"
+msgid "B<-d, --dry-run>"
+msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:41
+#: partprobe.8:40
msgid "Don't update the kernel."
msgstr "Não atualiza o kernel."
-# type: TP
#. type: TP
-#: partprobe.8:41
+#: partprobe.8:40
#, no-wrap
-msgid "B<-s>"
-msgstr "B<-s>"
+msgid "B<-s, --summary>"
+msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:44
+#: partprobe.8:43
msgid "Show a summary of devices and their partitions."
msgstr "Mostra um sumário dos dispositivos e suas partições."
-# type: TP
#. type: TP
-#: partprobe.8:44
+#: partprobe.8:43
#, no-wrap
-msgid "B<-h>"
-msgstr "B<-h>"
+msgid "B<-h, --help>"
+msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:47
+#: partprobe.8:46
msgid "Show summary of options."
msgstr "Mostra sumário de opções."
-# type: TP
#. type: TP
-#: partprobe.8:47
+#: partprobe.8:46
#, no-wrap
-msgid "B<-v>"
-msgstr "B<-v>"
+msgid "B<-v, --version>"
+msgstr ""
# type: Plain text
#. type: Plain text
-#: partprobe.8:50
+#: partprobe.8:49
msgid "Show version of program."
msgstr "Mostra versão do programa."
+#. type: SH
+#: partprobe.8:49
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr ""
+
+#. type: Plain text
+#: partprobe.8:51
+msgid "Report bugs to E<lt>bug-parted at gnu.orgE<gt>"
+msgstr ""
+
# type: SH
#. type: SH
-#: partprobe.8:50
+#: partprobe.8:51
#, no-wrap
msgid "SEE ALSO"
msgstr "VEJA TAMBÉM"
# type: Plain text
#. type: Plain text
-#: partprobe.8:52
+#: partprobe.8:53
msgid "B<parted>(8)."
msgstr "B<parted>(8)."
# type: SH
#. type: SH
-#: partprobe.8:52
+#: partprobe.8:53
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
# type: Plain text
#. type: Plain text
-#: partprobe.8:54
+#: partprobe.8:55
msgid ""
"This manual page was written by Timshel Knoll E<lt>timshel at debian.orgE<gt>, "
"for the Debian GNU/Linux system (but may be used by others)."
msgstr ""
"Esta página de manual foi escrita por Timshel Knoll E<lt>timshel at debian."
"orgE<gt>, para o sistema Debian GNU/Linux (mas pode ser usado por outros)."
+
+# type: TP
+#~ msgid "B<-d>"
+#~ msgstr "B<-d>"
+
+# type: TP
+#~ msgid "B<-s>"
+#~ msgstr "B<-s>"
+
+# type: TP
+#~ msgid "B<-h>"
+#~ msgstr "B<-h>"
+
+# type: TP
+#~ msgid "B<-v>"
+#~ msgstr "B<-v>"
More information about the Parted-commits
mailing list