[neon/backports-jammy/packagekit-qt/Neon/unstable] /: Imported Upstream version 0.8.8
Matthias Klumpp
null at kde.org
Wed Mar 15 04:29:31 GMT 2023
Git commit de36601d154d609443187f8cd31239afeabd4c5e by Matthias Klumpp.
Committed on 04/06/2013 at 12:47.
Pushed by carlosdem into branch 'Neon/unstable'.
Imported Upstream version 0.8.8
M +2 -2 CMakeLists.txt
M +497 -160 COPYING
M +19 -0 NEWS
M +6 -6 RELEASE
M +81 -11 src/daemon.cpp
M +23 -0 src/daemon.h
M +2 -0 src/daemonprivate.h
M +145 -82 src/transaction.cpp
M +217 -60 src/transaction.h
M +5 -10 src/transactionprivate.cpp
M +8 -4 src/transactionprivate.h
https://invent.kde.org/neon/backports-jammy/packagekit-qt/commit/de36601d154d609443187f8cd31239afeabd4c5e
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04a617d..7a0713c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,11 +8,11 @@ set(CMAKE_BUILD_TYPE "Debug")
set(QPACKAGEKIT_VERSION_MAJOR "0")
set(QPACKAGEKIT_VERSION_MINOR "8")
-set(QPACKAGEKIT_VERSION_PATCH "7")
+set(QPACKAGEKIT_VERSION_PATCH "8")
set(QPACKAGEKIT_VERSION_SUFFIX "${VERSION_SUFFIX}")
set(QPACKAGEKIT_VERSION "${QPACKAGEKIT_VERSION_MAJOR}.${QPACKAGEKIT_VERSION_MINOR}.${QPACKAGEKIT_VERSION_PATCH}")
-set(QPACKAGEKIT_API_LEVEL "5")
+set(QPACKAGEKIT_API_LEVEL "6")
# Forbid in-tree building
if(${CMAKE_SOURCE_DIR} MATCHES ${CMAKE_BINARY_DIR})
diff --git a/COPYING b/COPYING
index 65c5ca8..4362b49 100644
--- a/COPYING
+++ b/COPYING
@@ -1,165 +1,502 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/NEWS b/NEWS
index 6456ccc..76e3875 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+Version 0.8.8
+~~~~~~~~~~~~~
+Released: 2013-05-09
+
+New Features:
+ - Adding Provides property to Daemon (Daniel Nicoletti)
+ - Adding some Meta information (Daniel Nicoletti)
+ - Adds the transactionFlags to the Transaction class (Daniel Nicoletti)
+ - Add TransactionFlags registration (Daniel Nicoletti)
+ - Implement connectNotify and disconnectNotify (Daniel Nicoletti)
+
+Bugfixes:
+ - Add missing declare enums (Daniel Nicoletti)
+ - Fix searchGroups() be iterating over the flaged values (Daniel Nicoletti)
+ - Ignore Interface isValid() check (Daniel Nicoletti)
+ - Improve error handling and make it easier for QML use it (Daniel Nicoletti)
+ - Make sure we set an error if we fail to contact PackageKit (Daniel Nicoletti)
+ - Use the correct version of the LGPL library (Richard Hughes)
+
Version 0.8.7
~~~~~~~~~~~~~
Released: 2012-01-17
diff --git a/RELEASE b/RELEASE
index 8b46229..5d2c6a2 100644
--- a/RELEASE
+++ b/RELEASE
@@ -2,10 +2,10 @@ PackageKit-Qt Release Notes
1. Write NEWS entries for PackageKit-Qt in the same format as usual.
-git shortlog QPACKAGEKIT_0_8_6.. | grep -i -v trivial | grep -v Merge > NEWS.new
+git shortlog QPACKAGEKIT_0_8_7.. | grep -i -v trivial | grep -v Merge > NEWS.new
--------------------------------------------------------------------------------
-Version 0.8.7
+Version 0.8.8
~~~~~~~~~~~~~
Released: 2013-xx-xx
@@ -20,13 +20,13 @@ Bugfixes:
3. Commit changes in PackageKit-Qt git:
-git commit -a -m "Release version 0.8.7"
-git tag -s -f -m "Release 0.8.7" QPACKAGEKIT_0_8_7
+git commit -a -m "Release version 0.8.8"
+git tag -s -f -m "Release 0.8.8" QPACKAGEKIT_0_8_8
<gpg password>
git push --tags
git push
-4. run './release.sh --version=0.8.7 --git-tag=QPACKAGEKIT_0_8_7 --sign'
+4. run './release.sh --version=0.8.8 --git-tag=QPACKAGEKIT_0_8_8 --sign'
5. Upload tarball to:
@@ -42,7 +42,7 @@ git push
8. Send an email to packagekit at lists.freedesktop.org
=================================================
-PackageKit-Qt 0.8.7 released!
+PackageKit-Qt 0.8.8 released!
Tarballs available here: http://www.packagekit.org/releases/
diff --git a/src/daemon.cpp b/src/daemon.cpp
index 5f1e372..7b49745 100644
--- a/src/daemon.cpp
+++ b/src/daemon.cpp
@@ -57,17 +57,6 @@ Daemon::Daemon(QObject *parent) :
QDBusConnection::systemBus(),
this);
- connect(d->daemon, SIGNAL(Changed()),
- this, SIGNAL(changed()));
- connect(d->daemon, SIGNAL(RepoListChanged()),
- this, SIGNAL(repoListChanged()));
- connect(d->daemon, SIGNAL(RestartSchedule()),
- this, SIGNAL(restartScheduled()));
- connect(d->daemon, SIGNAL(TransactionListChanged(QStringList)),
- this, SIGNAL(transactionListChanged(QStringList)));
- connect(d->daemon, SIGNAL(UpdatesChanged()),
- this, SIGNAL(updatesChanged()));
-
// Set up database for desktop files
QSqlDatabase db;
db = QSqlDatabase::addDatabase("QSQLITE", PK_DESKTOP_DEFAULT_DATABASE);
@@ -75,6 +64,81 @@ Daemon::Daemon(QObject *parent) :
if (!db.open()) {
qDebug() << "Failed to initialize the desktop files database";
}
+
+ qRegisterMetaType<PackageKit::Daemon::Network>("PackageKit::Daemon::Network");
+ qRegisterMetaType<PackageKit::Daemon::Authorize>("PackageKit::Daemon::Authorize");
+ qRegisterMetaType<PackageKit::Transaction::InternalError>("PackageKit::Transaction::InternalError");
+ qRegisterMetaType<PackageKit::Transaction::Role>("PackageKit::Transaction::Role");
+ qRegisterMetaType<PackageKit::Transaction::Error>("PackageKit::Transaction::Error");
+ qRegisterMetaType<PackageKit::Transaction::Exit>("PackageKit::Transaction::Exit");
+ qRegisterMetaType<PackageKit::Transaction::Filter>("PackageKit::Transaction::Filter");
+ qRegisterMetaType<PackageKit::Transaction::Message>("PackageKit::Transaction::Message");
+ qRegisterMetaType<PackageKit::Transaction::Status>("PackageKit::Transaction::Status");
+ qRegisterMetaType<PackageKit::Transaction::MediaType>("PackageKit::Transaction::MediaType");
+ qRegisterMetaType<PackageKit::Transaction::Provides>("PackageKit::Transaction::Provides");
+ qRegisterMetaType<PackageKit::Transaction::ProvidesFlag>("PackageKit::Transaction::ProvidesFlag");
+ qRegisterMetaType<PackageKit::Transaction::DistroUpgrade>("PackageKit::Transaction::DistroUpgrade");
+ qRegisterMetaType<PackageKit::Transaction::UpgradeKind>("PackageKit::Transaction::UpgradeKind");
+ qRegisterMetaType<PackageKit::Transaction::TransactionFlag>("PackageKit::Transaction::TransactionFlag");
+ qRegisterMetaType<PackageKit::Transaction::TransactionFlags>("PackageKit::Transaction::TransactionFlags");
+ qRegisterMetaType<PackageKit::Transaction::Restart>("PackageKit::Transaction::Restart");
+ qRegisterMetaType<PackageKit::Transaction::UpdateState>("PackageKit::Transaction::UpdateState");
+ qRegisterMetaType<PackageKit::Transaction::Group>("PackageKit::Transaction::Group");
+ qRegisterMetaType<PackageKit::Transaction::Info>("PackageKit::Transaction::Info");
+ qRegisterMetaType<PackageKit::Transaction::SigType>("PackageKit::Transaction::SigType");
+}
+
+void DaemonPrivate::setupSignal(const QString &signal, bool connect)
+{
+ Q_Q(Daemon);
+
+ const char *signalToConnect = 0;
+ const char *memberToConnect = 0;
+
+ if (signal == SIGNAL(changed())) {
+ signalToConnect = SIGNAL(Changed());
+ memberToConnect = SIGNAL(changed());
+ } else if (signal == SIGNAL(repoListChanged())) {
+ signalToConnect = SIGNAL(RepoListChanged());
+ memberToConnect = SIGNAL(repoListChanged());
+ } else if (signal == SIGNAL(restartScheduled())) {
+ signalToConnect = SIGNAL(RestartSchedule());
+ memberToConnect = SIGNAL(restartScheduled());
+ } else if (signal == SIGNAL(transactionListChanged(QStringList))) {
+ signalToConnect = SIGNAL(TransactionListChanged(QStringList));
+ memberToConnect = SIGNAL(transactionListChanged(QStringList));
+ } else if (signal == SIGNAL(updatesChanged())) {
+ signalToConnect = SIGNAL(UpdatesChanged());
+ memberToConnect = SIGNAL(updatesChanged());
+ }
+
+ if (signalToConnect && memberToConnect) {
+ if (connect) {
+ q->connect(daemon, signalToConnect, memberToConnect);
+ } else {
+ daemon->disconnect(signalToConnect, q, memberToConnect);
+ }
+ }
+}
+
+void Daemon::connectNotify(const char *signal)
+{
+ Q_D(Daemon);
+ if (!d->connectedSignals.contains(signal) && d->daemon) {
+ d->setupSignal(signal, true);
+ }
+ d->connectedSignals << signal;
+}
+
+void Daemon::disconnectNotify(const char *signal)
+{
+ Q_D(Daemon);
+ if (d->connectedSignals.contains(signal)) {
+ d->connectedSignals.removeOne(signal);
+ if (d->daemon && !d->connectedSignals.contains(signal)) {
+ d->setupSignal(signal, false);
+ }
+ }
}
Daemon::~Daemon()
@@ -87,6 +151,12 @@ Transaction::Roles Daemon::actions()
return d->daemon->roles();
}
+Transaction::ProvidesFlag Daemon::provides()
+{
+ Q_D(const Daemon);
+ return static_cast<Transaction::ProvidesFlag>(d->daemon->provides());
+}
+
QString Daemon::backendName()
{
Q_D(const Daemon);
diff --git a/src/daemon.h b/src/daemon.h
index 06f112e..07d1654 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -52,6 +52,7 @@ class Daemon : public QObject
Q_ENUMS(Network)
Q_ENUMS(Authorize)
Q_PROPERTY(Transaction::Roles actions READ actions NOTIFY changed)
+ Q_PROPERTY(Transaction::ProvidesFlag provides READ provides NOTIFY changed)
Q_PROPERTY(QString backendName READ backendName NOTIFY changed)
Q_PROPERTY(QString backendDescription READ backendDescription NOTIFY changed)
Q_PROPERTY(QString backendAuthor READ backendAuthor NOTIFY changed)
@@ -107,6 +108,11 @@ public:
*/
Transaction::Roles actions();
+ /**
+ * Returns all the actions supported by the current backend
+ */
+ Transaction::ProvidesFlag provides();
+
/**
* The backend name, e.g. "yum".
*/
@@ -397,6 +403,20 @@ Q_SIGNALS:
void daemonQuit();
protected:
+ /**
+ * This method connects to DBus signals
+ * \attention Make sure to call this method in inherited classes
+ * otherwise no signals will be emitted
+ */
+ virtual void connectNotify(const char *signal);
+
+ /**
+ * This method disconnects from DBus signals
+ * \attention Make sure to call this method in inherited classes
+ * otherwise no signals will be disconnected
+ */
+ virtual void disconnectNotify(const char *signal);
+
DaemonPrivate * const d_ptr;
private:
@@ -408,4 +428,7 @@ private:
} // End namespace PackageKit
+Q_DECLARE_METATYPE(PackageKit::Daemon::Network)
+Q_DECLARE_METATYPE(PackageKit::Daemon::Authorize)
+
#endif
diff --git a/src/daemonprivate.h b/src/daemonprivate.h
index 5ea2f53..0fcb9f1 100644
--- a/src/daemonprivate.h
+++ b/src/daemonprivate.h
@@ -42,8 +42,10 @@ protected:
::DaemonProxy *daemon;
QStringList hints;
QDBusError lastError;
+ QStringList connectedSignals;
QList<Transaction*> transactions(const QList<QDBusObjectPath> &tids, QObject *parent);
+ void setupSignal(const QString &signal, bool connect);
protected Q_SLOTS:
void serviceUnregistered();
diff --git a/src/transaction.cpp b/src/transaction.cpp
index 113ff74..e9966c9 100644
--- a/src/transaction.cpp
+++ b/src/transaction.cpp
@@ -26,7 +26,8 @@
#include "daemon.h"
#include "common.h"
-#include <QtSql/QSqlQuery>
+#include <QSqlQuery>
+#include <QDBusError>
#define RUN_TRANSACTION(blurb) \
Q_D(Transaction); \
@@ -35,6 +36,7 @@
r.waitForFinished(); \
if (r.isError()) { \
d->error = Transaction::parseError(r.error().name()); \
+ d->errorMessage = r.error().message(); \
} \
} \
@@ -55,103 +57,134 @@ Transaction::Transaction(const QDBusObjectPath &tid, QObject *parent) :
init(tid);
}
-bool Transaction::init(const QDBusObjectPath &tid)
+void Transaction::connectNotify(const char *signal)
{
Q_D(Transaction);
-
- if (d->p) {
- return true;
+ if (!d->connectedSignals.contains(signal) && d->p) {
+ d->setupSignal(signal, true);
}
+ d->connectedSignals << signal;
+}
- // If the user used a null tid
- // he want us to get it
- if (tid.path().isNull()) {
- d->tid = Daemon::global()->getTid();
- } else {
- d->tid = tid;
+void Transaction::disconnectNotify(const char *signal)
+{
+ Q_D(Transaction);
+ if (d->connectedSignals.contains(signal)) {
+ d->connectedSignals.removeOne(signal);
+ if (d->p && !d->connectedSignals.contains(signal)) {
+ d->setupSignal(signal, false);
+ }
}
+}
- if (d->tid.path().isEmpty()) {
- d->error = Transaction::InternalErrorDaemonUnreachable;
- return false;
- } else {
-
+void TransactionPrivate::setupSignal(const QString &signal, bool connect)
+{
+ Q_Q(Transaction);
+
+ const char *signalToConnect = 0;
+ const char *memberToConnect = 0;
+
+ if (signal == SIGNAL(changed())) {
+ signalToConnect = SIGNAL(Changed());
+ memberToConnect = SIGNAL(changed());
+ } else if (signal == SIGNAL(category(QString,QString,QString,QString,QString))) {
+ signalToConnect = SIGNAL(Category(QString,QString,QString,QString,QString));
+ memberToConnect = SIGNAL(category(QString,QString,QString,QString,QString));
+ } else if (signal == SIGNAL(details(QString,QString,PackageKit::Transaction::Group,QString,QString,qulonglong))) {
+ signalToConnect = SIGNAL(Details(QString,QString,uint,QString,QString,qulonglong));
+ memberToConnect = SLOT(Details(QString,QString,uint,QString,QString,qulonglong));
+ } else if (signal == SIGNAL(distroUpgrade(PackageKit::Transaction::DistroUpgrade,QString,QString))) {
+ signalToConnect = SIGNAL(DistroUpgrade(uint,QString,QString));
+ memberToConnect = SLOT(distroUpgrade(uint,QString,QString));
+ } else if (signal == SIGNAL(errorCode(PackageKit::Transaction::Error,QString))) {
+ signalToConnect = SIGNAL(ErrorCode(uint,QString));
+ memberToConnect = SLOT(errorCode(uint,QString));
+ } else if (signal == SIGNAL(files(QString,QStringList))) {
+ signalToConnect = SIGNAL(Files(QString,QStringList));
+ memberToConnect = SIGNAL(files(QString,QStringList));
+ } else if (signal == SIGNAL(finished(PackageKit::Transaction::Exit,uint))) {
+ signalToConnect = SIGNAL(Finished(uint,uint));
+ memberToConnect = SLOT(finished(uint,uint));
+ } else if (signal == SIGNAL(message(PackageKit::Transaction::Message,QString))) {
+ signalToConnect = SIGNAL(Message(uint,QString));
+ memberToConnect = SLOT(message(uint,QString));
+ } else if (signal == SIGNAL(package(PackageKit::Transaction::Info,QString,QString))) {
+ signalToConnect = SIGNAL(Package(uint,QString,QString));
+ memberToConnect = SLOT(Package(uint,QString,QString));
+ } else if (signal == SIGNAL(repoDetail(QString,QString,bool))) {
+ signalToConnect = SIGNAL(RepoDetail(QString,QString,bool));
+ memberToConnect = SIGNAL(repoDetail(QString,QString,bool));
+ } else if (signal == SIGNAL(repoSignatureRequired(QString,QString,QString,QString,QString,QString,QString,PackageKit::Transaction::SigType))) {
+ signalToConnect = SIGNAL(RepoSignatureRequired(QString,QString,QString,QString,QString,QString,QString,uint));
+ memberToConnect = SLOT(RepoSignatureRequired(QString,QString,QString,QString,QString,QString,QString,uint));
+ } else if (signal == SIGNAL(eulaRequired(QString,QString,QString,QString))) {
+ signalToConnect = SIGNAL(EulaRequired(QString,QString,QString,QString));
+ memberToConnect = SIGNAL(eulaRequired(QString,QString,QString,QString));
+ } else if (signal == SIGNAL(mediaChangeRequired(PackageKit::Transaction::MediaType,QString,QString))) {
+ signalToConnect = SIGNAL(MediaChangeRequired(uint,QString,QString));
+ memberToConnect = SLOT(mediaChangeRequired(uint,QString,QString));
+ } else if (signal == SIGNAL(itemProgress(QString,PackageKit::Transaction::Status,uint))) {
+ signalToConnect = SIGNAL(ItemProgress(QString,uint,uint));
+ memberToConnect = SLOT(ItemProgress(QString,uint,uint));
+ } else if (signal == SIGNAL(requireRestart(PackageKit::Transaction::Restart,QString))) {
+ signalToConnect = SIGNAL(RequireRestart(uint,QString));
+ memberToConnect = SLOT(requireRestart(uint,QString));
+ } else if (signal == SIGNAL(transaction(PackageKit::Transaction*))) {
+ signalToConnect = SIGNAL(Transaction(QDBusObjectPath,QString,bool,uint,uint,QString,uint,QString));
+ memberToConnect = SLOT(transaction(QDBusObjectPath,QString,bool,uint,uint,QString,uint,QString));
+ } else if (signal == SIGNAL(updateDetail(QString,QStringList,QStringList,QStringList,QStringList,QStringList,PackageKit::Transaction::Restart,QString,QString,PackageKit::Transaction::UpdateState,QDateTime,QDateTime))) {
+ signalToConnect = SIGNAL(UpdateDetail(QString,QStringList,QStringList,QStringList,QStringList,QStringList,uint,QString,QString,uint,QString,QString));
+ memberToConnect = SLOT(UpdateDetail(QString,QStringList,QStringList,QStringList,QStringList,QStringList,uint,QString,QString,uint,QString,QString));
}
- int retry = 0;
- do {
- d->p = new TransactionProxy(QLatin1String(PK_NAME),
- d->tid.path(),
- QDBusConnection::systemBus(),
- this);
- if (!d->p->isValid()) {
- qWarning() << "Error, cannot create transaction proxy" << d->p->lastError();
- QDBusMessage message;
- message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.DBus"),
- QLatin1String("/"),
- QLatin1String("org.freedesktop.DBus"),
- QLatin1String("StartServiceByName"));
- message << qVariantFromValue(QString("org.freedesktop.PackageKit"));
- message << qVariantFromValue(0U);
- QDBusConnection::sessionBus().call(message, QDBus::BlockWithGui);
-
- // The transaction was not created
- delete d->p;
- d->p = 0;
- retry++;
+ if (signalToConnect && memberToConnect) {
+ if (connect) {
+ q->connect(p, signalToConnect, memberToConnect);
} else {
- retry = 0;
+ p->disconnect(signalToConnect, q, memberToConnect);
}
- } while (retry == 1);
+ }
+}
+
+bool Transaction::init(const QDBusObjectPath &tid)
+{
+ Q_D(Transaction);
- // if the transaction proxy was not created return false
- if (!d->p) {
- return false;
+ if (d->p) {
+ return true;
+ }
+
+ if (!tid.path().isNull()) {
+ d->tid = tid;
} else {
- d->error = Transaction::InternalErrorNone;
- if (!Daemon::global()->hints().isEmpty()) {
- setHints(Daemon::global()->hints());
+ d->tid = Daemon::global()->getTid();
+ if (d->tid.path().isNull()) {
+ d->error = Transaction::InternalErrorFailed;
+ if (Daemon::global()->lastError().isValid()) {
+ d->errorMessage = Daemon::global()->lastError().message();
+ }
+ return false;
}
}
- connect(d->p, SIGNAL(Changed()),
- SIGNAL(changed()));
- connect(d->p, SIGNAL(Category(QString,QString,QString,QString,QString)),
- SIGNAL(category(QString,QString,QString,QString,QString)));
+ d->p = new TransactionProxy(QLatin1String(PK_NAME),
+ d->tid.path(),
+ QDBusConnection::systemBus(),
+ this);
+ d->error = Transaction::InternalErrorNone;
+ d->errorMessage.clear();
+ if (!Daemon::global()->hints().isEmpty()) {
+ setHints(Daemon::global()->hints());
+ }
+
connect(d->p, SIGNAL(Destroy()),
SLOT(destroy()));
- connect(d->p, SIGNAL(Destroy()),
- SIGNAL(destroy()));
- connect(d->p, SIGNAL(Details(QString,QString,uint,QString,QString,qulonglong)),
- SLOT(Details(QString,QString,uint,QString,QString,qulonglong)));
- connect(d->p, SIGNAL(DistroUpgrade(uint,QString,QString)),
- SLOT(distroUpgrade(uint,QString,QString)));
- connect(d->p, SIGNAL(ErrorCode(uint,QString)),
- SLOT(errorCode(uint,QString)));
- connect(d->p, SIGNAL(Files(QString,QStringList)),
- SLOT(files(QString,QStringList)));
- connect(d->p, SIGNAL(Finished(uint,uint)),
- SLOT(finished(uint,uint)));
- connect(d->p, SIGNAL(Message(uint,QString)),
- SLOT(message(uint,QString)));
- connect(d->p, SIGNAL(Package(uint,QString,QString)),
- SLOT(Package(uint,QString,QString)));
- connect(d->p, SIGNAL(RepoDetail(QString,QString,bool)),
- SIGNAL(repoDetail(QString,QString,bool)));
- connect(d->p, SIGNAL(RepoSignatureRequired(QString,QString,QString,QString,QString, QString,QString,uint)),
- SLOT(RepoSignatureRequired(QString,QString,QString,QString,QString, QString,QString,uint)));
- connect(d->p, SIGNAL(EulaRequired(QString,QString,QString,QString)),
- SIGNAL(eulaRequired(QString,QString,QString,QString)));
- connect(d->p, SIGNAL(MediaChangeRequired(uint,QString,QString)),
- SLOT(mediaChangeRequired(uint,QString,QString)));
- connect(d->p, SIGNAL(ItemProgress(QString,uint,uint)),
- SLOT(ItemProgress(QString,uint,uint)));
- connect(d->p, SIGNAL(RequireRestart(uint,QString)),
- SLOT(requireRestart(uint,QString)));
- connect(d->p, SIGNAL(Transaction(QDBusObjectPath,QString,bool,uint,uint,QString,uint,QString)),
- SLOT(transaction(QDBusObjectPath,QString,bool,uint,uint,QString,uint,QString)));
- connect(d->p, SIGNAL(UpdateDetail(QString,QStringList,QStringList,QStringList,QStringList,QStringList, uint,QString,QString,uint,QString,QString)),
- SLOT(UpdateDetail(QString,QStringList,QStringList,QStringList,QStringList,QStringList,uint,QString,QString,uint,QString,QString)));
+
+ QStringList currentSignals = d->connectedSignals;
+ currentSignals.removeDuplicates();
+ foreach (const QString &signal, currentSignals) {
+ d->setupSignal(signal, true);
+ }
return true;
}
@@ -204,6 +237,18 @@ Transaction::InternalError Transaction::error() const
return d->error;
}
+Transaction::InternalError Transaction::internalError() const
+{
+ Q_D(const Transaction);
+ return d->error;
+}
+
+QString Transaction::internalErrorMessage() const
+{
+ Q_D(const Transaction);
+ return d->errorMessage;
+}
+
bool Transaction::allowCancel() const
{
Q_D(const Transaction);
@@ -370,6 +415,15 @@ Transaction::Status Transaction::status() const
return Transaction::StatusUnknown;
}
+Transaction::TransactionFlags Transaction::transactionFlags() const
+{
+ Q_D(const Transaction);
+ if (d->p) {
+ return static_cast<Transaction::TransactionFlags>(d->p->transactionFlags());
+ }
+ return Transaction::TransactionFlagNone;
+}
+
QDateTime Transaction::timespec() const
{
Q_D(const Transaction);
@@ -607,7 +661,16 @@ void Transaction::searchGroup(Group group, Filters filters)
void Transaction::searchGroups(Groups groups, Transaction::Filters filters)
{
- searchGroups(groups, filters);
+ QStringList groupsStringList;
+ for (int i = 1; i < 64; ++i) {
+ if (groups & i) {
+ Transaction::Group group = static_cast<Transaction::Group>(i);
+ if (group != Transaction::GroupUnknown) {
+ groupsStringList << Daemon::enumToString<Transaction>(group, "Group");
+ }
+ }
+ }
+ searchGroups(groupsStringList, filters);
}
void Transaction::searchNames(const QStringList &search, Transaction::Filters filters)
diff --git a/src/transaction.h b/src/transaction.h
index c20cac5..ad1f14e 100644
--- a/src/transaction.h
+++ b/src/transaction.h
@@ -49,7 +49,7 @@ class TransactionPrivate;
class Transaction : public QObject
{
Q_OBJECT
- Q_ENUMS(InternalsError)
+ Q_ENUMS(InternalError)
Q_ENUMS(Role)
Q_ENUMS(Error)
Q_ENUMS(Exit)
@@ -64,8 +64,13 @@ class Transaction : public QObject
Q_ENUMS(Group)
Q_ENUMS(Info)
Q_ENUMS(SigType)
+ Q_ENUMS(Filter)
Q_FLAGS(TransactionFlag TransactionFlags)
Q_FLAGS(Filter Filters)
+ Q_PROPERTY(QDBusObjectPath tid READ tid NOTIFY changed)
+ Q_PROPERTY(InternalError error READ internalError NOTIFY changed)
+ Q_PROPERTY(InternalError internalError READ internalError NOTIFY changed)
+ Q_PROPERTY(QString internalErrorMessage READ internalErrorMessage NOTIFY changed)
Q_PROPERTY(bool allowCancel READ allowCancel NOTIFY changed)
Q_PROPERTY(bool isCallerActive READ isCallerActive NOTIFY changed)
Q_PROPERTY(QString lastPackage READ lastPackage NOTIFY changed)
@@ -76,6 +81,13 @@ class Transaction : public QObject
Q_PROPERTY(qulonglong downloadSizeRemaining READ downloadSizeRemaining)
Q_PROPERTY(Role role READ role NOTIFY changed)
Q_PROPERTY(Status status READ status NOTIFY changed)
+ Q_PROPERTY(TransactionFlags transactionFlags READ transactionFlags NOTIFY changed)
+ Q_PROPERTY(QDateTime timespec READ timespec NOTIFY changed)
+ Q_PROPERTY(bool succeeded READ succeeded NOTIFY changed)
+ Q_PROPERTY(uint duration READ duration NOTIFY changed)
+ Q_PROPERTY(QString data READ data NOTIFY changed)
+ Q_PROPERTY(uint uid READ uid NOTIFY changed)
+ Q_PROPERTY(QString cmdline READ cmdline NOTIFY changed)
public:
/**
* Describes an error at the daemon level (for example, PackageKit crashes or is unreachable)
@@ -355,6 +367,7 @@ public:
ProvidesPythonModule,
ProvidesLanguageSupport
};
+ Q_DECLARE_FLAGS(ProvidesFlag, Provides)
/**
* Describes an distro upgrade state
@@ -498,8 +511,6 @@ public:
* The transaction object \b cannot be reused
* (i.e. removePackages then installPackages)
*
- * \warning after creating the transaction object be sure
- * to verify if it doesn't have any error()
*/
Transaction(QObject *parent = 0);
@@ -536,7 +547,23 @@ public:
* \return A value from TransactionError describing the state of the transaction
* or 0 in case of not having an error
*/
- Transaction::InternalError error() const;
+ Q_DECL_DEPRECATED InternalError error() const;
+
+ /**
+ * \brief Returns the error status of the Transaction
+ *
+ * \return A value from TransactionError describing the state of the transaction
+ * or 0 in case of not having an error
+ */
+ InternalError internalError() const;
+
+ /**
+ * \brief Returns the error message of the Transaction startup
+ *
+ * \return a string in case an error was set when trying to
+ * perform an action
+ */
+ QString internalErrorMessage() const;
/**
* Indicates whether you can cancel the transaction or not
@@ -601,7 +628,7 @@ public:
* like InstallPackages, SearchName or GetUpdates
* \return the current role of the transaction
*/
- Transaction::Role role() const;
+ Role role() const;
/**
* Returns the current state of the transaction
@@ -610,35 +637,10 @@ public:
Status status() const;
/**
- * \brief Tells the underlying package manager to use the given \p hints
- *
- * This method allows the calling session to set transaction \p hints for
- * the package manager which can change as the transaction runs.
- *
- * This method can be sent before the transaction has been run
- * (by using Daemon::setHints) or whilst it is running
- * (by using Transaction::setHints).
- * There is no limit to the number of times this
- * method can be sent, although some backends may only use the values
- * that were set before the transaction was started.
- *
- * The \p hints can be filled with entries like these
- * ('locale=en_GB.utf8','idle=true','interactive=false').
- *
- * \sa Daemon::setHints
- */
- Q_INVOKABLE void setHints(const QStringList &hints);
-
- /**
- * Convenience function to set this transaction \p hints
- * \sa getDetails(const QStringList &hints)
+ * The current flags set in this transaction
+ * \return a \sa Transaction::TransactionFlags of this transaction
*/
- Q_INVOKABLE void setHints(const QString &hints);
-
- /**
- * Reset the transaction for reuse
- */
- Q_INVOKABLE void reset();
+ TransactionFlags transactionFlags() const;
/**
* Returns the date at which the transaction was created
@@ -682,6 +684,37 @@ public:
*/
QString cmdline() const;
+ /**
+ * \brief Tells the underlying package manager to use the given \p hints
+ *
+ * This method allows the calling session to set transaction \p hints for
+ * the package manager which can change as the transaction runs.
+ *
+ * This method can be sent before the transaction has been run
+ * (by using Daemon::setHints) or whilst it is running
+ * (by using Transaction::setHints).
+ * There is no limit to the number of times this
+ * method can be sent, although some backends may only use the values
+ * that were set before the transaction was started.
+ *
+ * The \p hints can be filled with entries like these
+ * ('locale=en_GB.utf8','idle=true','interactive=false').
+ *
+ * \sa Daemon::setHints
+ */
+ Q_INVOKABLE void setHints(const QStringList &hints);
+
+ /**
+ * Convenience function to set this transaction \p hints
+ * \sa getDetails(const QStringList &hints)
+ */
+ Q_INVOKABLE void setHints(const QString &hints);
+
+ /**
+ * Reset the transaction for reuse
+ */
+ Q_INVOKABLE void reset();
+
/**
* \brief Accepts an EULA
*
@@ -689,18 +722,24 @@ public:
*
* \note You need to manually restart the transaction which triggered the EULA.
* \sa eulaRequired()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
- void acceptEula(const QString &eulaID);
+ Q_INVOKABLE void acceptEula(const QString &eulaID);
/**
* Download the given \p packages to a temp dir, if \p storeInCache is true
* the download will be stored in the package manager cache
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
- void downloadPackages(const QStringList &packageIDs, bool storeInCache = false);
+ Q_INVOKABLE void downloadPackages(const QStringList &packageIDs, bool storeInCache = false);
/**
* This is a convenience function to download this \p package
* \sa downloadPackages(const QStringList &packageIDs, bool storeInCache = false)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void downloadPackage(const QString &packageID, bool storeInCache = false);
@@ -708,6 +747,8 @@ public:
* Returns the collection categories
*
* \sa category
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getCategories();
@@ -719,12 +760,16 @@ public:
* fetch the dependencies's dependencies.
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getDepends(const QStringList &packageIDs, Filters filters, bool recursive = false);
/**
* Convenience function to get the dependencies of this \p package
* \sa getDetails(const QStringList &packageIDs, Filters filters, bool recursive = false)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getDepends(const QString &packageID, Filters filters , bool recursive = false);
@@ -734,12 +779,16 @@ public:
* \sa Transaction::details
* \note This method emits \sa package()
* with details set
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getDetails(const QStringList &packageIDs);
/**
* Convenience function to get the details about this \p package
* \sa getDetails(const QStringList &packageIDs)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getDetails(const QString &packageID);
@@ -747,12 +796,16 @@ public:
* Gets the files contained in the given \p packages
*
* \note This method emits \sa files()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getFiles(const QStringList &packageIDs);
/**
* Convenience function to get the files contained in this \p package
* \sa getRequires(const QStringList &packageIDs)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getFiles(const QString &packageIDs);
@@ -761,6 +814,8 @@ public:
*
* \note You must delete these transactions yourself
* \note This method emits \sa transaction()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getOldTransactions(uint number);
@@ -768,6 +823,8 @@ public:
* Gets all the packages matching the given \p filters
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getPackages(Filters filters = FilterNone);
@@ -775,6 +832,8 @@ public:
* Gets the list of software repositories matching the given \p filters
*
* \note This method emits \sa repository()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getRepoList(Filters filter = FilterNone);
@@ -786,12 +845,16 @@ public:
* also search for the package requiring the resulting packages.
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getRequires(const QStringList &packageIDs, Filters filters, bool recursive = false);
/**
* Convenience function to get packages requiring this package
* \sa getRequires(const QStringList &packageIDs, Filters filters, bool recursive = false)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getRequires(const QString &packageID, Filters filters, bool recursive = false);
@@ -799,12 +862,16 @@ public:
* Retrieves more details about the update for the given \p packageIDs
*
* \note This method emits \sa updateDetail()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getUpdatesDetails(const QStringList &packageIDs);
/**
* Convenience function to get update details
* \sa getUpdateDetail(const QStringList &packageIDs)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getUpdateDetail(const QString &packageID);
@@ -814,6 +881,8 @@ public:
* The \p filters parameters can be used to restrict the updates returned
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getUpdates(Filters filters = FilterNone);
@@ -821,6 +890,8 @@ public:
* Retrieves the available distribution upgrades
*
* \note This method emits \sa distroUpgrade()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void getDistroUpgrades();
@@ -829,14 +900,17 @@ public:
*
* \p onlyTrusted indicate if the packages are signed by a trusted authority
*
- * \note This method emits \sa package()
- * and \sa changed()
+ * \note This method emits \sa package() and \sa changed()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void installFiles(const QStringList &files, TransactionFlags flags = TransactionFlagOnlyTrusted);
/**
* Convenience function to install a file
* \sa installFiles(const QStringList &files, TransactionFlags flags)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void installFile(const QString &file, TransactionFlags flags = TransactionFlagOnlyTrusted);
@@ -845,14 +919,17 @@ public:
*
* \p only_trusted indicates if we should allow installation of untrusted packages (requires a different authorization)
*
- * \note This method emits \sa package()
- * and \sa changed()
+ * \note This method emits \sa package() and \sa changed()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void installPackages(const QStringList &packageIDs, TransactionFlags flags = TransactionFlagOnlyTrusted);
/**
* Convenience function to install a package
* \sa installPackages(const QStringList &packageIDs, TransactionFlags flags)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void installPackage(const QString &packageID, TransactionFlags flags = TransactionFlagOnlyTrusted);
@@ -860,6 +937,8 @@ public:
* \brief Installs a signature
*
* \p type, \p keyId and \p package generally come from the Transaction::repoSignatureRequired
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void installSignature(SigType type, const QString &keyID, const QString &packageID);
@@ -867,6 +946,8 @@ public:
* Refreshes the package manager's cache
*
* \note This method emits \sa changed()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void refreshCache(bool force);
@@ -877,29 +958,39 @@ public:
* packages to be removed. \p autoRemove tells the package manager to remove all the package which
* won't be needed anymore after the packages are uninstalled.
*
- * \note This method emits \sa package()
- * and \sa changed()
+ * \note This method emits \sa package() and \sa changed()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void removePackages(const QStringList &packageIDs, bool allowDeps = false, bool autoRemove = false, TransactionFlags flags = TransactionFlagOnlyTrusted);
/**
* Convenience function to remove a package
+ *
* \sa removePackages(const PackageList &packages, bool allowDeps = false, bool autoRemove = false, TransactionFlags flags)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void removePackage(const QString &packageID, bool allowDeps = false, bool autoRemove = false, TransactionFlags flags = TransactionFlagOnlyTrusted);
/**
* Repairs a broken system
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void repairSystem(TransactionFlags flags = TransactionFlagOnlyTrusted);
/**
* Activates or disables a repository
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void repoEnable(const QString &repoId, bool enable = true);
/**
* Sets a repository's parameter
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void repoSetData(const QString &repoId, const QString ¶meter, const QString &value);
@@ -909,12 +1000,16 @@ public:
* The \p filters can be used to restrict the search
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void resolve(const QStringList &packageNames, Filters filters = FilterNone);
/**
* Convenience function to remove a package name
* \sa resolve(const QStringList &packageNames, Filters filters = FilterNone)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void resolve(const QString &packageName, Filters filters = FilterNone);
@@ -924,12 +1019,16 @@ public:
* \p filters can be used to restrict the returned packages
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void searchFiles(const QStringList &search, Filters filters = FilterNone);
/**
* Convenience function to search for a file
* \sa searchFiles(const QStringList &search, Filters filters = FilterNone)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void searchFiles(const QString &search, Filters filters = FilterNone);
@@ -939,12 +1038,16 @@ public:
* \p filters can be used to restrict the returned packages
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void searchDetails(const QStringList &search, Filters filters = FilterNone);
/**
* Convenience function to search by details
* \sa searchDetails(const QStringList &search, Filters filters = FilterNone)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void searchDetails(const QString &search, Filters filters = FilterNone);
@@ -956,18 +1059,24 @@ public:
* \p filters can be used to restrict the returned packages
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void searchGroups(const QStringList &groups, Filters filters = FilterNone);
/**
* Convenience function to search by group string
* \sa searchGroups(const QStringList &groups, Filters filters = FilterNone)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void searchGroup(const QString &group, Filters filters = FilterNone);
/**
* Convenience function to search by group enum
* \sa searchGroups(const QStringList &groups, Filters filters = FilterNone)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void searchGroup(Group group, Filters filters = FilterNone);
@@ -977,6 +1086,8 @@ public:
* \p filters can be used to restrict the returned packages
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void searchGroups(Groups group, Filters filters = FilterNone);
@@ -986,12 +1097,16 @@ public:
* \p filters can be used to restrict the returned packages
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void searchNames(const QStringList &search, Filters filters = FilterNone);
/**
* Convenience function to search by names
* \sa searchNames(const QStringList &search, Filters filters)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void searchNames(const QString &search, Filters filters = FilterNone);
@@ -999,14 +1114,17 @@ public:
* Update the given \p packages
*
* \p onlyTrusted indicates if this transaction is only allowed to install trusted packages
- * \note This method emits \sa package()
- * and \sa changed()
+ * \note This method emits \sa package() and \sa changed()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void updatePackages(const QStringList &packageIDs, TransactionFlags flags = TransactionFlagOnlyTrusted);
/**
* Convenience function to update a package
* \sa updatePackages(const QStringList &packageIDs, TransactionFlags flags)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void updatePackage(const QString &packageID, TransactionFlags flags = TransactionFlagOnlyTrusted);
@@ -1027,6 +1145,8 @@ public:
* \li changed()
* \li error()
* \li package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void upgradeSystem(const QString &distroId, UpgradeKind kind);
@@ -1034,17 +1154,23 @@ public:
* Searchs for a package providing a file/a mimetype
*
* \note This method emits \sa package()
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void whatProvides(Provides type, const QStringList &search, Filters filters = FilterNone);
/**
* Convenience function to search for what provides
* \sa whatProvides(Provides type, const QStringList &search, Filters filters = FilterNone)
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void whatProvides(Provides type, const QString &search, Filters filters = FilterNone);
/**
* Cancels the transaction
+ *
+ * \warning check \sa error() to know if it the call has any error
*/
Q_INVOKABLE void cancel();
@@ -1221,6 +1347,20 @@ Q_SIGNALS:
protected:
static Transaction::InternalError parseError(const QString &errorName);
+ /**
+ * This method connects to DBus signals
+ * \attention Make sure to call this method in inherited classes
+ * otherwise no signals will be emitted
+ */
+ virtual void connectNotify(const char *signal);
+
+ /**
+ * This method disconnects from DBus signals
+ * \attention Make sure to call this method in inherited classes
+ * otherwise no signals will be disconnected
+ */
+ virtual void disconnectNotify(const char *signal);
+
TransactionPrivate * const d_ptr;
private:
@@ -1235,29 +1375,46 @@ private:
uint uid,
const QString &cmdline,
QObject *parent);
- Q_DECLARE_PRIVATE(Transaction);
+ Q_DECLARE_PRIVATE(Transaction)
Q_DISABLE_COPY(Transaction)
- Q_PRIVATE_SLOT(d_ptr, void Details(const QString &pid, const QString &license, uint group, const QString &detail, const QString &url, qulonglong size));
- Q_PRIVATE_SLOT(d_ptr, void distroUpgrade(uint type, const QString &name, const QString &description));
- Q_PRIVATE_SLOT(d_ptr, void errorCode(uint error, const QString &details));
- Q_PRIVATE_SLOT(d_ptr, void mediaChangeRequired(uint mediaType, const QString &mediaId, const QString &mediaText));
- Q_PRIVATE_SLOT(d_ptr, void files(const QString &pid, const QStringList &filenames));
- Q_PRIVATE_SLOT(d_ptr, void finished(uint exitCode, uint runtime));
- Q_PRIVATE_SLOT(d_ptr, void message(uint type, const QString &message));
- Q_PRIVATE_SLOT(d_ptr, void Package(uint info, const QString &pid, const QString &summary));
- Q_PRIVATE_SLOT(d_ptr, void ItemProgress(const QString &itemID, uint status, uint percentage));
- Q_PRIVATE_SLOT(d_ptr, void RepoSignatureRequired(const QString &pid, const QString &repoName, const QString &keyUrl, const QString &keyUserid, const QString &keyId, const QString &keyFingerprint, const QString &keyTimestamp, uint type));
- Q_PRIVATE_SLOT(d_ptr, void requireRestart(uint type, const QString &pid));
- Q_PRIVATE_SLOT(d_ptr, void transaction(const QDBusObjectPath &oldTid, const QString ×pec, bool succeeded, uint role, uint duration, const QString &data, uint uid, const QString &cmdline));
- Q_PRIVATE_SLOT(d_ptr, void UpdateDetail(const QString &package_id, const QStringList &updates, const QStringList &obsoletes, const QStringList &vendor_urls, const QStringList &bugzilla_urls, const QStringList &cve_urls, uint restart, const QString &update_text, const QString &changelog, uint state, const QString &issued, const QString &updated));
- Q_PRIVATE_SLOT(d_ptr, void destroy());
- Q_PRIVATE_SLOT(d_ptr, void daemonQuit());
+ Q_PRIVATE_SLOT(d_ptr, void Details(const QString &pid, const QString &license, uint group, const QString &detail, const QString &url, qulonglong size))
+ Q_PRIVATE_SLOT(d_ptr, void distroUpgrade(uint type, const QString &name, const QString &description))
+ Q_PRIVATE_SLOT(d_ptr, void errorCode(uint error, const QString &details))
+ Q_PRIVATE_SLOT(d_ptr, void mediaChangeRequired(uint mediaType, const QString &mediaId, const QString &mediaText))
+ Q_PRIVATE_SLOT(d_ptr, void finished(uint exitCode, uint runtime))
+ Q_PRIVATE_SLOT(d_ptr, void message(uint type, const QString &message))
+ Q_PRIVATE_SLOT(d_ptr, void Package(uint info, const QString &pid, const QString &summary))
+ Q_PRIVATE_SLOT(d_ptr, void ItemProgress(const QString &itemID, uint status, uint percentage))
+ Q_PRIVATE_SLOT(d_ptr, void RepoSignatureRequired(const QString &pid, const QString &repoName, const QString &keyUrl, const QString &keyUserid, const QString &keyId, const QString &keyFingerprint, const QString &keyTimestamp, uint type))
+ Q_PRIVATE_SLOT(d_ptr, void requireRestart(uint type, const QString &pid))
+ Q_PRIVATE_SLOT(d_ptr, void transaction(const QDBusObjectPath &oldTid, const QString ×pec, bool succeeded, uint role, uint duration, const QString &data, uint uid, const QString &cmdline))
+ Q_PRIVATE_SLOT(d_ptr, void UpdateDetail(const QString &package_id, const QStringList &updates, const QStringList &obsoletes, const QStringList &vendor_urls, const QStringList &bugzilla_urls, const QStringList &cve_urls, uint restart, const QString &update_text, const QString &changelog, uint state, const QString &issued, const QString &updated))
+ Q_PRIVATE_SLOT(d_ptr, void destroy())
+ Q_PRIVATE_SLOT(d_ptr, void daemonQuit())
};
Q_DECLARE_OPERATORS_FOR_FLAGS(Transaction::Filters)
Q_DECLARE_OPERATORS_FOR_FLAGS(Transaction::TransactionFlags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Transaction::ProvidesFlag)
} // End namespace PackageKit
-
+Q_DECLARE_METATYPE(PackageKit::Transaction::InternalError)
+Q_DECLARE_METATYPE(PackageKit::Transaction::Role)
+Q_DECLARE_METATYPE(PackageKit::Transaction::Error)
+Q_DECLARE_METATYPE(PackageKit::Transaction::Exit)
+Q_DECLARE_METATYPE(PackageKit::Transaction::Message)
+Q_DECLARE_METATYPE(PackageKit::Transaction::Status)
+Q_DECLARE_METATYPE(PackageKit::Transaction::MediaType)
+Q_DECLARE_METATYPE(PackageKit::Transaction::Provides)
+Q_DECLARE_METATYPE(PackageKit::Transaction::DistroUpgrade)
+Q_DECLARE_METATYPE(PackageKit::Transaction::TransactionFlag)
+Q_DECLARE_METATYPE(PackageKit::Transaction::Restart)
+Q_DECLARE_METATYPE(PackageKit::Transaction::UpdateState)
+Q_DECLARE_METATYPE(PackageKit::Transaction::Group)
Q_DECLARE_METATYPE(PackageKit::Transaction::Info)
+Q_DECLARE_METATYPE(PackageKit::Transaction::SigType)
+Q_DECLARE_METATYPE(PackageKit::Transaction::Filter)
+Q_DECLARE_METATYPE(PackageKit::Transaction::TransactionFlags)
+Q_DECLARE_METATYPE(PackageKit::Transaction::Filters)
+Q_DECLARE_METATYPE(PackageKit::Transaction::ProvidesFlag)
#endif
diff --git a/src/transactionprivate.cpp b/src/transactionprivate.cpp
index 1bf50e1..ea0f559 100644
--- a/src/transactionprivate.cpp
+++ b/src/transactionprivate.cpp
@@ -73,12 +73,6 @@ void TransactionPrivate::mediaChangeRequired(uint mediaType, const QString &medi
mediaText);
}
-void TransactionPrivate::files(const QString &pid, const QStringList &fileList)
-{
- Q_Q(Transaction);
- q->files(pid, fileList);
-}
-
void TransactionPrivate::finished(uint exitCode, uint runtime)
{
Q_Q(Transaction);
@@ -92,6 +86,7 @@ void TransactionPrivate::destroy()
delete p;
p = 0;
}
+ q->destroy();
}
void TransactionPrivate::daemonQuit()
@@ -121,7 +116,7 @@ void TransactionPrivate::ItemProgress(const QString &itemID, uint status, uint p
{
Q_Q(Transaction);
q->itemProgress(itemID,
- static_cast<Transaction::Status>(status),
+ static_cast<PackageKit::Transaction::Status>(status),
percentage);
}
@@ -148,7 +143,7 @@ void TransactionPrivate::RepoSignatureRequired(const QString &pid,
void TransactionPrivate::requireRestart(uint type, const QString &pid)
{
Q_Q(Transaction);
- q->requireRestart(static_cast<Transaction::Restart>(type), pid);
+ q->requireRestart(static_cast<PackageKit::Transaction::Restart>(type), pid);
}
void TransactionPrivate::transaction(const QDBusObjectPath &oldTid,
@@ -184,10 +179,10 @@ void TransactionPrivate::UpdateDetail(const QString &package_id,
vendor_urls,
bugzilla_urls,
cve_urls,
- static_cast<Transaction::Restart>(restart),
+ static_cast<PackageKit::Transaction::Restart>(restart),
update_text,
changelog,
- static_cast<Transaction::UpdateState>(state),
+ static_cast<PackageKit::Transaction::UpdateState>(state),
QDateTime::fromString(issued, Qt::ISODate),
QDateTime::fromString(updated, Qt::ISODate));
}
diff --git a/src/transactionprivate.h b/src/transactionprivate.h
index b70aa22..d6c9408 100644
--- a/src/transactionprivate.h
+++ b/src/transactionprivate.h
@@ -22,8 +22,9 @@
#ifndef PACKAGEKIT_TRANSACTION_PRIVATE_H
#define PACKAGEKIT_TRANSACTION_PRIVATE_H
-#include <QtCore/QString>
-#include <QtCore/QHash>
+#include <QString>
+#include <QHash>
+#include <QStringList>
#include "transaction.h"
@@ -36,11 +37,12 @@ class TransactionPrivate
Q_DECLARE_PUBLIC(Transaction)
protected:
TransactionPrivate(Transaction *parent);
- virtual ~TransactionPrivate() {};
+ virtual ~TransactionPrivate() {}
QDBusObjectPath tid;
::TransactionProxy* p;
Transaction *q_ptr;
+ QStringList connectedSignals;
// Only used for old transactions
QDateTime timespec;
@@ -52,13 +54,15 @@ protected:
QString cmdline;
Transaction::InternalError error;
+ QString errorMessage;
+
+ void setupSignal(const QString &signal, bool connect);
protected Q_SLOTS:
void Details(const QString &pid, const QString &license, uint group, const QString &detail, const QString &url, qulonglong size);
void distroUpgrade(uint type, const QString &name, const QString &description);
void errorCode(uint error, const QString &details);
void mediaChangeRequired(uint mediaType, const QString &mediaId, const QString &mediaText);
- void files(const QString &pid, const QStringList &file_list);
void finished(uint exitCode, uint runtime);
void message(uint type, const QString &message);
void Package(uint info, const QString &pid, const QString &summary);
More information about the Neon-commits
mailing list