]>
Commit | Line | Data |
---|---|---|
04e18045 JB |
1 | --- PackageKit-1.0.5/backends/zypp/pk-backend-zypp.cpp.orig 2014-12-15 16:21:39.000000000 +0100 |
2 | +++ PackageKit-1.0.5/backends/zypp/pk-backend-zypp.cpp 2015-02-21 11:57:31.071358228 +0100 | |
3 | @@ -273,7 +273,7 @@ | |
4 | } | |
5 | ||
6 | virtual Action problem (zypp::Resolvable::constPtr resolvable, Error error, const std::string &description, RpmLevel level) { | |
7 | - pk_backend_job_error_code (_job, PK_ERROR_ENUM_PACKAGE_FAILED_TO_INSTALL, description.c_str ()); | |
8 | + pk_backend_job_error_code (_job, PK_ERROR_ENUM_PACKAGE_FAILED_TO_INSTALL, "%s", description.c_str ()); | |
9 | return ABORT; | |
10 | } | |
11 | ||
12 | @@ -308,7 +308,7 @@ | |
13 | } | |
14 | ||
15 | virtual Action problem (zypp::Resolvable::constPtr resolvable, Error error, const std::string &description) { | |
16 | - pk_backend_job_error_code (_job, PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE, description.c_str ()); | |
17 | + pk_backend_job_error_code (_job, PK_ERROR_ENUM_CANNOT_REMOVE_SYSTEM_PACKAGE, "%s", description.c_str ()); | |
18 | return ABORT; | |
19 | } | |
20 | ||
21 | @@ -407,7 +407,7 @@ | |
22 | { | |
23 | virtual Action requestMedia (zypp::Url &url, unsigned mediaNr, const std::string &label, zypp::media::MediaChangeReport::Error error, const std::string &description, const std::vector<std::string> & devices, unsigned int &dev_current) | |
24 | { | |
25 | - pk_backend_job_error_code (_job, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, description.c_str ()); | |
26 | + pk_backend_job_error_code (_job, PK_ERROR_ENUM_REPO_NOT_AVAILABLE, "%s", description.c_str ()); | |
27 | // We've to abort here, because there is currently no feasible way to inform the user to insert/change media | |
28 | return ABORT; | |
29 | } | |
30 | @@ -597,10 +597,10 @@ | |
31 | initialized = TRUE; | |
32 | } | |
33 | } catch (const ZYppFactoryException &ex) { | |
34 | - pk_backend_job_error_code (priv->currentJob, PK_ERROR_ENUM_FAILED_INITIALIZATION, ex.asUserString().c_str() ); | |
35 | + pk_backend_job_error_code (priv->currentJob, PK_ERROR_ENUM_FAILED_INITIALIZATION, "%s", ex.asUserString().c_str() ); | |
36 | return NULL; | |
37 | } catch (const Exception &ex) { | |
38 | - pk_backend_job_error_code (priv->currentJob, PK_ERROR_ENUM_INTERNAL_ERROR, ex.asUserString().c_str() ); | |
39 | + pk_backend_job_error_code (priv->currentJob, PK_ERROR_ENUM_INTERNAL_ERROR, "%s", ex.asUserString().c_str() ); | |
40 | return NULL; | |
41 | } | |
42 | ||
43 | @@ -966,7 +966,7 @@ | |
44 | RepoManager manager; | |
45 | info = manager.getRepositoryInfo (alias); | |
46 | } catch (const repo::RepoNotFoundException &ex) { | |
47 | - pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_NOT_FOUND, ex.asUserString().c_str() ); | |
48 | + pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_NOT_FOUND, "%s", ex.asUserString().c_str() ); | |
49 | return RepoInfo (); | |
50 | } | |
51 | ||
52 | @@ -1411,7 +1411,7 @@ | |
53 | it->statusReset (); | |
54 | } | |
55 | ||
56 | - pk_backend_job_error_code (job, PK_ERROR_ENUM_DEP_RESOLUTION_FAILED, emsg); | |
57 | + pk_backend_job_error_code (job, PK_ERROR_ENUM_DEP_RESOLUTION_FAILED, "%s", emsg); | |
58 | g_free (emsg); | |
59 | ||
60 | goto exit; | |
61 | @@ -1538,11 +1538,11 @@ | |
62 | pk_backend_job_set_percentage(job, 100); | |
63 | ret = TRUE; | |
64 | } catch (const repo::RepoNotFoundException &ex) { | |
65 | - pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_NOT_FOUND, ex.asUserString().c_str() ); | |
66 | + pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_NOT_FOUND, "%s", ex.asUserString().c_str() ); | |
67 | } catch (const target::rpm::RpmException &ex) { | |
68 | - pk_backend_job_error_code (job, PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED, ex.asUserString().c_str () ); | |
69 | + pk_backend_job_error_code (job, PK_ERROR_ENUM_PACKAGE_DOWNLOAD_FAILED, "%s", ex.asUserString().c_str () ); | |
70 | } catch (const Exception &ex) { | |
71 | - pk_backend_job_error_code (job, PK_ERROR_ENUM_INTERNAL_ERROR, ex.asUserString().c_str() ); | |
72 | + pk_backend_job_error_code (job, PK_ERROR_ENUM_INTERNAL_ERROR, "%s", ex.asUserString().c_str() ); | |
73 | } | |
74 | ||
75 | exit: | |
76 | @@ -1601,7 +1601,7 @@ | |
77 | catch ( const Exception &e) | |
78 | { | |
79 | // FIXME: make sure this dumps out the right sring. | |
80 | - pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_NOT_FOUND, e.asUserString().c_str() ); | |
81 | + pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_NOT_FOUND, "%s", e.asUserString().c_str() ); | |
82 | return FALSE; | |
83 | } | |
84 | ||
85 | @@ -1651,7 +1651,7 @@ | |
86 | pk_backend_job_set_percentage (job, i >= num_of_repos ? 100 : (100 * i) / num_of_repos); | |
87 | } | |
88 | if (repo_messages != NULL) | |
89 | - g_printf(repo_messages); | |
90 | + g_printf("%s", repo_messages); | |
91 | ||
92 | pk_backend_job_set_percentage (job, 100); | |
93 | g_free (repo_messages); | |
94 | @@ -2373,7 +2373,7 @@ | |
95 | try { | |
96 | manager.removeRepository (tmpRepo); | |
97 | } catch (const repo::RepoNotFoundException &ex) { | |
98 | - pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_NOT_FOUND, ex.asUserString().c_str() ); | |
99 | + pk_backend_job_error_code (job, PK_ERROR_ENUM_REPO_NOT_FOUND, "%s", ex.asUserString().c_str() ); | |
100 | } | |
101 | } | |
102 | ||
103 | @@ -3308,7 +3308,7 @@ | |
104 | } catch (const repo::RepoException &ex) { | |
105 | pk_backend_job_error_code (job, PK_ERROR_ENUM_INTERNAL_ERROR, "Can't access the given URL"); | |
106 | } catch (const Exception &ex) { | |
107 | - pk_backend_job_error_code (job, PK_ERROR_ENUM_INTERNAL_ERROR, ex.asString ().c_str ()); | |
108 | + pk_backend_job_error_code (job, PK_ERROR_ENUM_INTERNAL_ERROR, "%s", ex.asString ().c_str ()); | |
109 | } | |
110 | } | |
111 |