Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/totem-pl-parser-02-replace-rdsk-with-dsk.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 17184 0a2030d1a47c
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17184
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
     1
 
--- totem-pl-parser-2.28.2/plparse/totem-disc.c.old	2009-12-14 16:22:43.662388768 +0800
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
     2
 
+++ totem-pl-parser-2.28.2/plparse/totem-disc.c	2009-12-14 16:26:10.975976171 +0800
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
     3
 
@@ -296,7 +296,16 @@
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
     4
 
   gboolean found, self_mounted;
15518
57f1bb699e1b add patch to fix rdsk/dsk problem for totem-pl-parser
jerrytan
parents:
diff changeset 
     5
57f1bb699e1b add patch to fix rdsk/dsk problem for totem-pl-parser
jerrytan
parents:
diff changeset 
     6
 
   if (dev[0] == '/') {
57f1bb699e1b add patch to fix rdsk/dsk problem for totem-pl-parser
jerrytan
parents:
diff changeset 
     7
 
+#ifdef __sun
57f1bb699e1b add patch to fix rdsk/dsk problem for totem-pl-parser
jerrytan
parents:
diff changeset 
     8
 
+    if (strstr(dev, "/dev/rdsk/") != NULL) {
17184
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
     9
 
+      local = g_strdup_printf("/dev/dsk/%s", dev+strlen("/dev/rdsk/"));
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
    10
 
+    }
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
    11
 
+    else {
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
    12
 
+      local = g_strdup (dev);
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
    13
 
+    }
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
    14
 
+#else
15518
57f1bb699e1b add patch to fix rdsk/dsk problem for totem-pl-parser
jerrytan
parents:
diff changeset 
    15
 
     local = g_strdup (dev);
17184
0a2030d1a47c bump to 2.28.2
jerrytan
parents: 15518
diff changeset 
    16
 
+#endif
15518
57f1bb699e1b add patch to fix rdsk/dsk problem for totem-pl-parser
jerrytan
parents:
diff changeset 
    17
 
     file = g_file_new_for_path (dev);
57f1bb699e1b add patch to fix rdsk/dsk problem for totem-pl-parser
jerrytan
parents:
diff changeset 
    18
 
   } else {
57f1bb699e1b add patch to fix rdsk/dsk problem for totem-pl-parser
jerrytan
parents:
diff changeset 
    19
 
     file = g_file_new_for_commandline_arg (dev);
upstream/oracle/spec-files