[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
The following commit has been merged in the wheezy branch:
commit c91ed282181958038adb96835bd980842e01d2bc
Author: Christian Costa <titan.costa@gmail.com>
Date: Mon Mar 26 22:06:01 2012 +0200
attrib: Add 2 missing spaces between attribute flags and filename.
(cherry picked from commit a4e2f1d42a4eb72b383cb335a745213f76930abb)
diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c
index 1238cb3..1bf4f47 100644
--- a/programs/attrib/attrib.c
+++ b/programs/attrib/attrib.c
@@ -197,7 +197,7 @@ int wmain(int argc, WCHAR *argv[])
fd.dwFileAttributes |= FILE_ATTRIBUTE_NORMAL;
SetFileAttributesW(name, fd.dwFileAttributes);
} else {
- static const WCHAR fmt[] = {'%','1',' ',' ',' ','%','2','\n','\0'};
+ static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'};
if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) {
flags[0] = 'H';
}
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 7537ebc..0b8e172 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -709,7 +709,7 @@ Read-only file forcibly deleted
@todo_wine@A R @pwd@\foobar\baz\level2@or_broken@A R @pwd@\foobar\baz\level2@or_broken@A R I @pwd@\foobar\baz\level2
@todo_wine@A @pwd@\foobar\bar@or_broken@A @pwd@\foobar\bar@or_broken@A I @pwd@\foobar\bar
--- folders processing
-@todo_wine@ @pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar
+ @pwd@\foobar@or_broken@ @pwd@\foobar@or_broken@ I @pwd@\foobar
@todo_wine@ R @pwd@\foobar\baz@or_broken@ R @pwd@\foobar\baz@or_broken@ @pwd@\foobar\baz@or_broken@ R I @pwd@\foobar\baz
@todo_wine@A @pwd@\foobar\baz\toto@or_broken@A @pwd@\foobar\baz\toto@or_broken@A I @pwd@\foobar\baz\toto
toto
--
Debian Wine packaging
Reply to: