[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 25801e13de0786b41cefb1c1697c65168521b1a0
Author: Christian Costa <titan.costa at gmail.com>
Date:   Mon Mar 26 22:06:17 2012 +0200

    attrib: Display attribute flags in the right order. (cherry picked from commit 6520f19181fc6853a9b2a6ec35acb759cc87e7fc)

diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c
index a00e104..ca15980 100644
--- a/programs/attrib/attrib.c
+++ b/programs/attrib/attrib.c
@@ -199,22 +199,22 @@ int wmain(int argc, WCHAR *argv[])
             } else {
                 static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'};
                 if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) {
-                    flags[0] = 'H';
+                    flags[4] = 'H';
                 }
                 if (fd.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) {
                     flags[1] = 'S';
                 }
                 if (fd.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) {
-                    flags[2] = 'A';
+                    flags[0] = 'A';
                 }
                 if (fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY) {
-                    flags[3] = 'R';
+                    flags[5] = 'R';
                 }
                 if (fd.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY) {
-                    flags[4] = 'T';
+                    flags[6] = 'T';
                 }
                 if (fd.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) {
-                    flags[5] = 'C';
+                    flags[7] = 'C';
                 }
                 strcpyW(name, curdir);
                 strcatW(name, fd.cFileName);
diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
index 0b8e172..bb75515 100644
--- a/programs/cmd/tests/test_builtins.cmd.exp
+++ b/programs/cmd/tests/test_builtins.cmd.exp
@@ -696,9 +696,9 @@ bar\baz removed
 @pwd@\foobar
 @pwd@
 ------------ Testing attrib ------------
- at todo_wine@A            @pwd@\foobar\foo at or_broken@A          @pwd@\foobar\foo at or_broken@A       I    @pwd@\foobar\foo
+A            @pwd@\foobar\foo at or_broken@A          @pwd@\foobar\foo at or_broken@A       I    @pwd@\foobar\foo
 --- read-only attribute
- at todo_wine@A    R       @pwd@\foobar\foo at or_broken@A    R     @pwd@\foobar\foo at or_broken@A    R  I    @pwd@\foobar\foo
+A    R       @pwd@\foobar\foo at or_broken@A    R     @pwd@\foobar\foo at or_broken@A    R  I    @pwd@\foobar\foo
 foo
 foo original contents
 Read-only file not deleted
@@ -707,7 +707,7 @@ Read-only file forcibly deleted
 @todo_wine at A            @pwd@\foobar\baz\level2 at or_broken@A          @pwd@\foobar\baz\level2 at or_broken@A       I    @pwd@\foobar\baz\level2
 @todo_wine at A    R       @pwd@\foobar\level1 at or_broken@A    R     @pwd@\foobar\level1 at or_broken@A    R  I    @pwd@\foobar\level1
 @todo_wine at A    R       @pwd@\foobar\baz\level2 at or_broken@A    R     @pwd@\foobar\baz\level2 at or_broken@A    R  I    @pwd@\foobar\baz\level2
- at todo_wine@A            @pwd@\foobar\bar at or_broken@A          @pwd@\foobar\bar at or_broken@A       I    @pwd@\foobar\bar
+A            @pwd@\foobar\bar at or_broken@A          @pwd@\foobar\bar at or_broken@A       I    @pwd@\foobar\bar
 --- folders processing
              @pwd@\foobar at or_broken@           @pwd@\foobar at or_broken@        I    @pwd@\foobar
 @todo_wine@     R       @pwd@\foobar\baz at or_broken@     R     @pwd@\foobar\baz at or_broken@           @pwd@\foobar\baz at or_broken@     R  I    @pwd@\foobar\baz

-- 
Debian Wine packaging