/[packages]/cauldron/abrt/current/SOURCES/abrt-1.1.13-mageia-release.patch
ViewVC logotype

Diff of /cauldron/abrt/current/SOURCES/abrt-1.1.13-mageia-release.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

cauldron/abrt/current/SOURCES/abrt-1.1.13-mandriva-release.patch revision 21273 by blino, Mon Jan 17 13:41:48 2011 UTC cauldron/abrt/current/SOURCES/abrt-1.1.13-mageia-release.patch revision 21530 by blino, Mon Jan 17 18:19:18 2011 UTC
# Line 5  Line 5 
5           SaveText(FILENAME_ARCHITECTURE, buf.machine);           SaveText(FILENAME_ARCHITECTURE, buf.machine);
6           std::string release;           std::string release;
7  -        LoadTextFile("/etc/redhat-release", release);  -        LoadTextFile("/etc/redhat-release", release);
8  +        LoadTextFile("/etc/mandriva-release", release);  +        LoadTextFile("/etc/release", release);
9           const char *release_ptr = release.c_str();           const char *release_ptr = release.c_str();
10           unsigned len_1st_str = strchrnul(release_ptr, '\n') - release_ptr;           unsigned len_1st_str = strchrnul(release_ptr, '\n') - release_ptr;
11           release.erase(len_1st_str); /* usually simply removes trailing '\n' */           release.erase(len_1st_str); /* usually simply removes trailing '\n' */
12    
13  --- lib/Utils/parse_release.cpp.mandriva-release        2010-07-19 17:44:32.000000000 +0200  --- lib/Utils/parse_release.cpp.mandriva-release        2010-07-19 17:44:32.000000000 +0200
14  +++ lib/Utils/parse_release.cpp 2010-08-10 12:19:41.000000000 +0200  +++ lib/Utils/parse_release.cpp 2010-08-10 12:19:41.000000000 +0200
15  @@ -26,19 +26,19 @@  @@ -26,19 +26,16 @@
16   // caller is reposible for freeing *product* and *version*   // caller is reposible for freeing *product* and *version*
17   void parse_release(const char *release, char** product, char** version)   void parse_release(const char *release, char** product, char** version)
18   {   {
19  -    if (strstr(release, "Rawhide"))  -    if (strstr(release, "Rawhide"))
20  +    if (strstr(release, "Cooker"))  +    if (strstr(release, "Cauldron"))
21       {       {
22  -        *product = xstrdup("Fedora");  -        *product = xstrdup("Fedora");
23  -        *version = xstrdup("rawhide");  -        *version = xstrdup("rawhide");
24  +        *product = xstrdup("Mandriva Linux");  +        *product = xstrdup("Mageia");
25  +        *version = xstrdup("cooker");  +        *version = xstrdup("Cauldron");
26           VERB3 log("%s: version:'%s' product:'%s'", __func__, *version, *product);           VERB3 log("%s: version:'%s' product:'%s'", __func__, *version, *product);
27           return;           return;
28       }       }
# Line 32  Line 32 
32  -        strbuf_append_str(buf_product, "Fedora");  -        strbuf_append_str(buf_product, "Fedora");
33  -    else if (strstr(release, "Red Hat Enterprise Linux"))  -    else if (strstr(release, "Red Hat Enterprise Linux"))
34  -        strbuf_append_str(buf_product, "Red Hat Enterprise Linux ");  -        strbuf_append_str(buf_product, "Red Hat Enterprise Linux ");
35  +    if (strstr(release, "Mandriva"))  +    strbuf_append_str(buf_product, "Mageia");
 +        strbuf_append_str(buf_product, "Mandriva Linux");  
 +    else if (strstr(release, "Mandriva Linux"))  
 +        strbuf_append_str(buf_product, "Mandriva Linux ");  
36    
37       const char *r = strstr(release, "release");       const char *r = strstr(release, "release");
38       const char *space = r ? strchr(r, ' ') : NULL;       const char *space = r ? strchr(r, ' ') : NULL;
Legend:
Removed from v.21273  
changed lines
  Added in v.21530
  ViewVC Help
Powered by ViewVC 1.1.30