Mercurial > trustbridge
comparison cinst/main.c @ 313:f17226aa2e09
Temporary build fix for windows. Also Use putenv in test
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 04 Apr 2014 11:02:02 +0000 |
| parents | fac7e1b0e558 |
| children | eff8e7ce4dae |
comparison
equal
deleted
inserted
replaced
| 312:4033c16beb04 | 313:f17226aa2e09 |
|---|---|
| 260 if (ret != 0) | 260 if (ret != 0) |
| 261 { | 261 { |
| 262 ERRORPRINTF ("Failed to write windows stores retval: %i\n", ret); | 262 ERRORPRINTF ("Failed to write windows stores retval: %i\n", ret); |
| 263 } | 263 } |
| 264 #endif | 264 #endif |
| 265 #ifndef WIN32 /* TODO Remove ifdef once it is implemented */ | |
| 265 ret = write_stores_nss (NULL, all_valid_certs); | 266 ret = write_stores_nss (NULL, all_valid_certs); |
| 267 #endif | |
| 266 return ret; | 268 return ret; |
| 267 } | 269 } |
| 268 | 270 |
| 269 ret = read_instructions_file (instruction_file_name, &to_install, | 271 ret = read_instructions_file (instruction_file_name, &to_install, |
| 270 &to_remove); | 272 &to_remove); |
| 303 if (ret != 0) | 305 if (ret != 0) |
| 304 { | 306 { |
| 305 ERRORPRINTF ("Failed to write windows stores retval: %i\n", ret); | 307 ERRORPRINTF ("Failed to write windows stores retval: %i\n", ret); |
| 306 } | 308 } |
| 307 #endif | 309 #endif |
| 310 #ifndef WIN32 /* TODO Remove ifdef once it is implemented */ | |
| 308 ret = write_stores_nss (to_install, to_remove); | 311 ret = write_stores_nss (to_install, to_remove); |
| 309 | 312 #endif |
| 310 if (ret != 0) | 313 if (ret != 0) |
| 311 { | 314 { |
| 312 ERRORPRINTF ("Failed to write nss stores"); | 315 ERRORPRINTF ("Failed to write nss stores"); |
| 313 } | 316 } |
| 314 | 317 |