Merge lp:~bladernr/opencompute/ocp-add-dcmitool-ipmitool-to-deps into lp:opencompute

[Jeff Lane ]

This adds dmcitool and ipmitool to recommends to make sure they get installed as well.

Don't know what happened to my other branch, but for some reason, LP just dumped all the code but kept the branch open :/ Maybe it was something screwed up on my end. IN any case, this is a re-try.

This adds dmcitool and ipmitool to recommends to make sure they get installed as well.

Unmerged revisions

2164. By Jeff Lane  on 2013-10-01

Another test run highlighted that neither dmcitool nor ipmitool are installed either. I don't think it'll hurt to install them side by side, so this adds them to the recommends as well

2163. By Jeff Marcom on 2013-10-01

Trivial fix to debian/control for build-system parser

Signed-off-by: Jeff Marcom <email address hidden>

2162. By Jeff Marcom on 2013-10-01

Clean up job description for ipmi tests

Signed-off-by: Jeff Marcom <email address hidden>

2161. By Jeff Lane  on 2013-09-30

Promotes several test packages from suggests to recommends.

2160. By Jeff Lane  on 2013-09-27

This does two things:
1: Enables the storage_devices tests using bonnie++ after determining that Bonnie is easily available via both apt and yum (for CentOS).
2: Adds a new io_stress test for disks that uses the disk I/O capabilities of googles stressapptest

2159. By Jeff Marcom on 2013-09-27

Merge adds new ipmi inband tests and fixes the job file name and test names to be more appropriate. Also separates them from miscellanea as IPMI tests have grown to a full suite now.

2158. By Jeff Marcom on 2013-09-27

Updated idle/check expression

Signed-off-by: Jeff Marcom <email address hidden>

2157. By Jeff Marcom on 2013-09-27

Fix symlink check

Signed-off-by: Jeff Marcom <email address hidden>

2156. By Jeff Marcom on 2013-09-27

Quick patch to miscellanea/idle_check to include job description so unit test will pass

Signed-off-by: Jeff Marcom <email address hidden>

2155. By Jeff Marcom on 2013-09-26

Added a simple check to bypass the symlink creation in an Ubuntu based release.

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2013-10-01 18:38:21 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True
 
=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-10-01 18:38:21 +0000
@@ -0,0 +1,42 @@
+__pycache__
+build
+checkbox.log
+checkbox.xsl
+debian/*-cli.postrm
+debian/*-gtk.postrm
+debian/*-qt.postrm
+debian/*-urwid.postrm
+debian/*.debhelper
+debian/*.log
+debian/*.substvars
+debian/checkbox
+debian/checkbox-cli
+debian/checkbox-gtk
+debian/checkbox-qt
+debian/checkbox-urwid
+debian/files
+debian/stamp-patched
+debian/tmp
+gtk/checkbox-gtk.glade.bak
+gtk/checkbox-gtk.gladep
+gtk/checkbox-gtk.gladep.bak
+lock
+plugins.bpickle
+plugins.bpickle.old
+python-build-stamp-2.5
+qt/frontend/Makefile
+qt/frontend/checkbox-qt-service
+qt/frontend/moc_qtfront.cpp
+qt/frontend/qrc_resources.cpp
+qt/frontend/ui_qtfront.h
+scripts/clocktest
+scripts/threaded_memtest
+store
+submission
+submission.xml
+submission.xml
+subunit.log
+system
+vagrant-logs/
+.vagrant
+plainbox/plainbox.egg-info
 
=== added file '.checkbox-editor.cfg'
--- .checkbox-editor.cfg	1970-01-01 00:00:00 +0000
+++ .checkbox-editor.cfg	2013-10-01 18:38:21 +0000
@@ -0,0 +1,18 @@
+[environment]
+checkbox_share = .
+
+[version control]
+push_branch = lp:checkbox
+pull_branch = lp:checkbox
+push_on_close = False
+commit_on_save = False
+pull_on_open = False
+exclude = .checkbox-editor.cfg
+
+[general]
+checkbox_data_cleanup = True
+replace_tabs_with_spaces = True
+number_of_spaces = 4
+checkbox_binary = ./bin/checkbox-gtk
+whitelist_resources = True
+
 
=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2013-10-01 18:38:21 +0000
@@ -0,0 +1,26 @@
+__pycache__
+# Ignore logs created by test-in-vagrant.sh
+vagrant-logs/
+# Ignore vagrant state file
+.vagrant
+# The list below is riddled with junk created by running the test suite of checkbox
+# It should be really cleaned up as tests should _not_ do that but right now it's more
+# annoying than dangerous so I'll get rid of the noise first
+*.o
+active_output
+checkbox.log
+checkbox.xsl
+plugins.bpickle
+plugins.bpickle.old
+qt/frontend/Makefile
+qt/frontend/checkbox-qt-service
+qt/frontend/moc_qtfront.cpp
+qt/frontend/qrc_resources.cpp
+qt/frontend/ui_qtfront.cpp
+qt/frontend/ui_qtfront.h
+store/
+submission.xml
+subunit.log
+build
+dist
+*.egg-info
 
=== renamed file '.gitignore' => '.gitignore.moved'
=== added file '.test-it.conf'
--- .test-it.conf	1970-01-01 00:00:00 +0000
+++ .test-it.conf	2013-10-01 18:38:21 +0000
@@ -0,0 +1,4 @@
+# Configuration data for test-it
+TI_RELEASES="lucid precise quantal raring"
+TI_CMD="python3 test"
+TI_DEPS="python3-lxml python3-setuptools"
 
=== added file '.travis.yml'
--- .travis.yml	1970-01-01 00:00:00 +0000
+++ .travis.yml	2013-10-01 18:38:21 +0000
@@ -0,0 +1,5 @@
+language: python
+python:
+    - "3.2"
+    - "3.3"
+script: cd plainbox && python3 setup.py test
 
=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2013-10-01 18:38:21 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, 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
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state 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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2013-10-01 18:38:21 +0000
@@ -0,0 +1,1 @@
+include checkbox/parsers/tests/pactl_data/*.txt
 
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2013-10-01 18:38:21 +0000
@@ -0,0 +1,5 @@
+This is Checkbox which provides an extensible interface for system testing.
+
+See the following page for documentation:
+
+https://wiki.ubuntu.com/Testing/Automation/Checkbox
 
=== added file 'README-PORT'
--- README-PORT	1970-01-01 00:00:00 +0000
+++ README-PORT	2013-10-01 18:38:21 +0000
@@ -0,0 +1,76 @@
+The following steps will port your Checkbox source from Ubuntu to CentOS 6.4.
+
+Note: Following steps are on an Ubuntu system.
+1) Install the devscripts package to create a debian package from source.
+  # apt-get install devscripts
+
+2) Perform the following command in the Checkbox source code root directory to create
+ a debian package.
+  /checkbox# debuild -i -us -uc -b
+
+3) Move up to the parent directory to view the debian packages that were built:
+  # cd ..
+
+4) Download alien to convert the .deb packages into .rpm packages.
+  # apt-get install alien
+
+5) Convert the .deb packages into .rpm packages using the following command:
+  alien -r package_name.deb --scripts 
+
+6) Transfer the checkbox*.rpm files to the CentOS 6.4 machine.
+
+Note: Following steps are on a CentOS 6.4 system.
+7) Install python3 on the CentOS machnine.
+  7a) Install Development tools to be able to build from source
+    # yum groupinstall "Development tools"
+  
+  7b) Install extra libraries for the python3 interpreter
+    # yum install zlib-devel bzip2-devel openssl-devel ncurses-devel sqllite-devel readline-devel tk-devel
+
+  7c) Add the Princeton University and the Institute for Advanced Study (PUIAS) repository to your mirrorlist to install python3.
+    i. Download the rpm gpg key
+      # cd /etc/pki/rpm-gpg
+      # wget -q http://springdale.math.ias.edu/data/puias/6/x86_64/os/RPM-GPG-KEY-puias
+      # rpm --import RPM-GPG-KEY-puias
+    ii. Create the repository file as /etc/yum.repos.d/puias-computational.repo
+      # cd /etc/yum.repos.d
+      # touch puias-computational.repo
+      # editor(vim, nano, etc) puias-computational.repo
+      [PUIAS_6_computational]
+      name=PUIAS computational BASE $releasever - $basearch 
+      mirrorlist=http://puias.math.ias.edu/data/puias/computational/$releasever/$basearch/mirrorlist
+      #baseurl=http://puias.math.ias.edu/data/puias/computational/$releasever/$basearch
+      gpgcheck=1
+      gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puias
+
+  7d) Search for python3 in your repo.  
+    # yum search python3
+
+  7e) Install python3 if it is returned after the search.
+    # yum install python3
+
+8) Install Distribute to allow python modules to be installed
+  8a) Download Distribute source code.
+    # wget http://pypi.python.org/packages/source/d/distribute/distribute-0.6.35.tar.gz
+
+  8b) Extract and Install
+    # tar -xzvf distribute-0.6.35.tar.gz
+    # cd distribute-0.6.35
+    # python3 setup.py build && python3 setup.py install
+
+9) Install the lxml python module that is needed by checkbox
+  9a) Install lxml dependencies
+    # yum install libxml2-devel libxslt-devel
+ 
+  9b) Install module
+    # easy_install-3.3 lxml
+
+10) Install the checkbox*.rpm files in the directory they were stored in.
+  # rpm -Uvh checkbox*.rpm
+
+11) Copy the checkbox files from /usr/lib/python3/dist-packages into /usr/lib/python3.3/site-packages/ or else checkbox won't run.
+  # cp -r /usr/lib/python3/dist-packages/checkbox* /usr/lib/python3.3/site-packages/
+
+12) Run checkbox at the terminal with the following command
+  # checkbox-ocp
+
 
=== added file 'Vagrantfile'
--- Vagrantfile	1970-01-01 00:00:00 +0000
+++ Vagrantfile	2013-10-01 18:38:21 +0000
@@ -0,0 +1,56 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby sw=2 ts=2 :
+
+Vagrant::Config.run do |config|
+
+  config.ssh.timeout = 60
+
+  # Define a Ubuntu Server image (cloud) for the 12.04 release (precise)
+  config.vm.define :precise do |precise_config|
+    precise_config.vm.box = "precise-cloud-i386"
+    precise_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # Define a Ubuntu Server image (cloud) for the 12.10 release (quantal)
+  config.vm.define :quantal do |quantal_config|
+    quantal_config.vm.box = "quantal-cloud-i386"
+    quantal_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/quantal/current/quantal-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # Define a Ubuntu Server image (cloud) for the 13.04 release (raring)
+  config.vm.define :raring do |raring_config|
+    raring_config.vm.box = "raring-cloud-i386"
+    raring_config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-i386-vagrant-disk1.box"
+  end
+
+  # For debugging and later future GUI testing
+  if ENV.key? "VAGRANT_GUI"
+    config.vm.boot_mode = :gui
+  end
+
+  # Setup an apt cache if one is available
+  if ENV.key? "VAGRANT_APT_CACHE"
+    config.vm.provision :shell, :inline => "echo 'Acquire::http { Proxy \"#{ENV['VAGRANT_APT_CACHE']}\"; };' > /etc/apt/apt.conf"
+  end
+
+  # Update to have the latest packages, this is needed because the image comes
+  # with an old (and no longer working) apt cache and links to many packages no
+  # longer work.
+  config.vm.provision :shell, :inline => "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade --yes"
+  # Install dependencies from native packages
+  config.vm.provision :shell, :inline => "apt-get install --yes python3-setuptools python3-pkg-resources python3-lxml"
+  # Install python3-mock so that we can create mock objects for testing
+  config.vm.provision :shell, :inline => "apt-get install --yes python3-mock"
+  # Install python3-sphinx so that we can build documentation
+  config.vm.provision :shell, :inline => "apt-get install --yes python3-sphinx"
+  # Install policykit-1 so that we have pkexec
+  config.vm.provision :shell, :inline => "apt-get install --yes policykit-1"
+  # Install some checkbox script dependencies:
+  # Later on those could be installed on demand to test how we behave without
+  # them but for now that's good enough. Little by little...
+  config.vm.provision :shell, :inline => "apt-get install --yes fwts"
+  # Develop plainbox so that we have it in $PATH
+  config.vm.provision :shell, :inline => "cd /vagrant/plainbox/ && python3 setup.py develop"
+  # Create a cool symlink so that everyone knows where to go to
+  config.vm.provision :shell, :inline => "ln --no-dereference --force --symbolic /vagrant /home/vagrant/checkbox"
+end
 
=== added directory 'apport'
=== added file 'apport/checkbox.py'
--- apport/checkbox.py	1970-01-01 00:00:00 +0000
+++ apport/checkbox.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,24 @@
+'''apport general hook for checkbox
+
+(c) 2009 Canonical Ltd.
+Author: David Murphy <[e-mail]>
+'''
+import os
+
+
+def add_info(report):
+    HOME = os.environ.get('HOME', '/')
+    CACHE_HOME = os.environ.get('XDG_CACHE_HOME',
+        os.path.join(HOME, '.cache'))
+    SYSTEM = os.path.join(CACHE_HOME, 'checkbox', 'system')
+    SUBMISSION = os.path.join(CACHE_HOME, 'checkbox', 'submission')
+
+    try:
+        report['CheckboxSystem'] = open(SYSTEM).read()
+    except IOError:
+        pass
+
+    try:
+        report['CheckboxSubmission'] = open(SUBMISSION).read()
+    except IOError:
+        pass
 
=== added file 'apport/source_checkbox.py'
--- apport/source_checkbox.py	1970-01-01 00:00:00 +0000
+++ apport/source_checkbox.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,20 @@
+'''apport package hook for checkbox
+
+(c) 2009 Canonical Ltd.
+Author: David Murphy <[e-mail]>
+'''
+import os
+
+from apport.hookutils import attach_file_if_exists
+
+
+def add_info(report):
+    HOME = os.environ.get('HOME', '/')
+    CACHE_HOME = os.environ.get('XDG_CACHE_HOME',
+        os.path.join(HOME, '.cache'))
+
+    SUBMISSION = os.path.join(CACHE_HOME, 'checkbox', 'submission.xml')
+    attach_file_if_exists(report, SUBMISSION)
+    
+    CHECKBOX_LOG = os.path.join(CACHE_HOME, 'checkbox', 'checkbox.log')
+    attach_file_if_exists(report, CHECKBOX_LOG)
 
=== added file 'backend'
--- backend	1970-01-01 00:00:00 +0000
+++ backend	2013-10-01 18:38:21 +0000
@@ -0,0 +1,66 @@
+#!/usr/bin/python3
+
+import os
+import sys
+
+from optparse import OptionParser
+from checkbox.lib.fifo import FifoReader, FifoWriter
+
+from checkbox.job import Job, FAIL
+
+
+def main(args):
+    usage = "Usage: %prog INPUT OUTPUT"
+    parser = OptionParser(usage=usage)
+    parser.add_option("-p", "--path",
+        help="PATH variable to replace in the environment")
+    (options, args) = parser.parse_args(args)
+
+    if len(args) < 2:
+        parser.error("Missing INPUT and OUTPUT")
+
+    # Set PATH
+    if options.path:
+        os.environ["PATH"] = options.path
+
+    # Set PYTHONPATH
+    pythonpath = sys.path[0]
+    if "PYTHONPATH" in os.environ:
+        pythonpath = ":".join([pythonpath, os.environ["PYTHONPATH"]])
+    os.environ["PYTHONPATH"] = pythonpath
+
+    reader = FifoReader(args[0])
+    writer = FifoWriter(args[1])
+
+    while True:
+        try:
+            message = reader.read_object()
+            #"unpack" the message
+            sequence, message = message
+            if message == "stop":
+                break
+            if message == "ping":
+                #Build a tuple with the sequence number as
+                #received
+                writer.write_object((sequence, "pong",))
+                continue
+            if isinstance(message, dict) and "command" in message:
+                job = Job(message["command"], message.get("environ"),
+                    message.get("timeout"))
+                status, data, duration = job.execute()
+                try:
+                    data = data.decode("utf-8")
+                except UnicodeDecodeError:
+                    status, data, duration = (FAIL, "Decode error", 0,)
+            else:
+                status, data, duration = (FAIL, "", 0,)
+            #Build a tuple with sequence number
+            writer.write_object((sequence, (status, data, duration,),))
+        except IOError:
+            break
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv[1:]))
 
=== added directory 'bin'
=== added file 'bin/checkbox-hw-collection'
--- bin/checkbox-hw-collection	1970-01-01 00:00:00 +0000
+++ bin/checkbox-hw-collection	2013-10-01 18:38:21 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+export CHECKBOX_DATA=${CHECKBOX_DATA:-~/.checkbox-hw-collection}
+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/hwsubmit.whitelist}
+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
+
+if [ $CHECKBOX_DATA != '.' ]
+then
+    old_data=$HOME/.checkbox-hw-collection
+    if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
+    then
+        mv -f $old_data $CHECKBOX_DATA
+    fi
+fi
+
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== added file 'bin/checkbox-ocp-cli'
--- bin/checkbox-ocp-cli	1970-01-01 00:00:00 +0000
+++ bin/checkbox-ocp-cli	2013-10-01 18:38:21 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
+
+if ( ! grep -q "Ubuntu" /etc/issue ) && [ ! -L /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
+if [ $CHECKBOX_DATA != '.' ]
+then
+    old_data=$HOME/.checkbox
+    if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
+    then
+        mv -f $old_data $CHECKBOX_DATA
+    fi
+fi
+
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== added file 'bin/checkbox-ocp-gtk'
--- bin/checkbox-ocp-gtk	1970-01-01 00:00:00 +0000
+++ bin/checkbox-ocp-gtk	2013-10-01 18:38:21 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
+
+if ( ! grep -q "Ubuntu" /etc/issue ) && [ ! -L /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
+if [ $CHECKBOX_DATA != '.' ]
+then
+    old_data=$HOME/.checkbox
+    if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
+    then
+        mv -f $old_data $CHECKBOX_DATA
+    fi
+fi
+
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== added file 'bin/checkbox-ocp-qt'
--- bin/checkbox-ocp-qt	1970-01-01 00:00:00 +0000
+++ bin/checkbox-ocp-qt	2013-10-01 18:38:21 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
+
+if ( ! grep -q "Ubuntu" /etc/issue ) && [ ! -L /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
+if [ $CHECKBOX_DATA != '.' ]
+then
+    old_data=$HOME/.checkbox
+    if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
+    then
+        mv -f $old_data $CHECKBOX_DATA
+    fi
+fi
+
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== added file 'bin/checkbox-ocp-urwid'
--- bin/checkbox-ocp-urwid	1970-01-01 00:00:00 +0000
+++ bin/checkbox-ocp-urwid	2013-10-01 18:38:21 +0000
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
+export CHECKBOX_DATA=${CHECKBOX_DATA:-.}
+export CHECKBOX_SHARE=${CHECKBOX_SHARE:-.}
+export CHECKBOX_OPTIONS=${CHECKBOX_OPTIONS:---whitelist-file=$CHECKBOX_SHARE/data/whitelists/opencompute-ready-local.whitelist}
+export PYTHONPATH=$PYTHONPATH:$CHECKBOX_SHARE
+
+if ( ! grep -q "Ubuntu" /etc/issue ) && [ ! -L /etc/checkbox.d/configs ]
+then ln -s /usr/share/checkbox/examples /etc/checkbox.d/configs
+fi
+
+if [ $CHECKBOX_DATA != '.' ]
+then
+    old_data=$HOME/.checkbox
+    if [ -d $old_data ] && [ ! -d $CHECKBOX_DATA ]
+    then
+        mv -f $old_data $CHECKBOX_DATA
+    fi
+fi
+
+python3 $CHECKBOX_SHARE/run "$@" $CHECKBOX_SHARE/configs/$(basename $0).ini
 
=== added directory 'checkbox'
=== added file 'checkbox/__init__.py'
=== added file 'checkbox/application.py'
--- checkbox/application.py	1970-01-01 00:00:00 +0000
+++ checkbox/application.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,136 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2008 Canonical Ltd.
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+#
+import os
+import sys
+import logging
+import posixpath
+
+from gettext import gettext as _
+
+from optparse import OptionParser
+
+from checkbox.lib.config import Config
+from checkbox.lib.environ import get_variable
+from checkbox.lib.log import set_logging
+from checkbox.lib.safe import safe_make_directory
+from checkbox.lib.text import split
+
+from checkbox.plugin import PluginManager
+from checkbox.reactor import Reactor
+
+
+class Application:
+
+    reactor_factory = Reactor
+
+    def __init__(self, config):
+        self._config = config
+        self.reactor = self.reactor_factory()
+
+        # Plugin manager setup
+        self.plugin_manager = PluginManager(self._config,
+            self.reactor)
+
+    def run(self):
+        try:
+            self.reactor.run()
+        except:
+            logging.exception("Error running reactor.")
+            raise
+
+
+class ApplicationManager:
+
+    application_factory = Application
+
+    default_log = os.path.join(get_variable("CHECKBOX_DATA", "."), "checkbox.log")
+    default_log_level = "info"
+
+    def parse_options(self, args):
+        usage = _("Usage: checkbox [OPTIONS]")
+        parser = OptionParser(usage=usage)
+        parser.add_option("--version",
+                          action="store_true",
+                          help=_("Print version information and exit."))
+        parser.add_option("-l", "--log",
+                          metavar="FILE",
+                          default=self.default_log,
+                          help=_("The file to write the log to."))
+        parser.add_option("--log-level",
+                          default=self.default_log_level,
+                          help=_("One of debug, info, warning, error or critical."))
+        parser.add_option("-c", "--config",
+                          action="append",
+                          type="string",
+                          default=[],
+                          help=_("Configuration override parameters."))
+        parser.add_option("-b", "--blacklist",
+                          help=_("Shorthand for --config=.*/jobs_info/blacklist."))
+        parser.add_option("-B", "--blacklist-file",
+                          help=_("Shorthand for --config=.*/jobs_info/blacklist_file."))
+        parser.add_option("-w", "--whitelist",
+                          help=_("Shorthand for --config=.*/jobs_info/whitelist."))
+        parser.add_option("-W", "--whitelist-file",
+                          help=_("Shorthand for --config=.*/jobs_info/whitelist_file."))
+        return parser.parse_args(args)
+
+    def create_application(self, args=sys.argv):
+        # Create data directory
+        data_directory = get_variable("CHECKBOX_DATA", ".")
+        safe_make_directory(data_directory)
+
+        # Prepend environment options
+        string_options = get_variable("CHECKBOX_OPTIONS", "")
+        args[:0] = split(string_options)
+        (options, args) = self.parse_options(args)
+
+        # Replace shorthands
+        for shorthand in "blacklist", "blacklist_file", "whitelist", "whitelist_file":
+            key = ".*/jobs_info/%s" % shorthand
+            value = getattr(options, shorthand)
+            if value:
+                options.config.append("=".join([key, value]))
+
+        # Set logging early
+        set_logging(options.log_level, options.log)
+
+        # Config setup
+        if len(args) != 2:
+            sys.stderr.write(_("Missing configuration file as argument.\n"))
+            sys.exit(1)
+
+        config = Config()
+        config_filename = posixpath.expanduser(args[1])
+        config.read_filename(config_filename)
+        config.read_configs(options.config)
+
+        section_name = "checkbox/plugins/client_info"
+        section = config.get_section(section_name)
+        if not section:
+            section = config.add_section(section_name)
+        section.set("name", posixpath.basename(args[1]) \
+            .replace(".ini", ""))
+        section.set("version", config.get_defaults().version)
+
+        # Check options
+        if options.version:
+            print(config.get_defaults().version)
+            sys.exit(0)
+
+        return self.application_factory(config)
 
=== added file 'checkbox/arguments.py'
--- checkbox/arguments.py	1970-01-01 00:00:00 +0000
+++ checkbox/arguments.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,95 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2008 Canonical Ltd.
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+#
+from inspect import getargspec
+
+from checkbox.lib.decorator import merge_function_metadata
+
+
+class ArgumentReplacer:
+    """A decorator helper that filters arguments to be passed to a function.
+
+    Create one with the original function and a function to replace
+    the arguments, and then call replace_arguments for each call to
+    the function.
+    """
+    def __init__(self, original_function, argument_replacer):
+        """
+        @param original_function: The function which will be called
+            soon. The function must *not* define any * or ** parameters.
+        @param argument_replacer: A function which will be called for
+            every argument. It will be passed a parameter name and the
+            associated argument. It should return the new value.
+        """
+        self.original_function = original_function
+        self.argument_replacer = argument_replacer
+
+        spec = getargspec(original_function)
+        self.all_arguments = spec[0]
+        if getattr(original_function, 'im_self', None) is not None:
+            # If it's bound, ignore the bound arguments.
+            self.all_arguments = self.all_arguments[1:]
+
+    def replace_arguments(self, args, kwargs):
+        """Filter some arguments destined to be passed to a function.
+
+        @param args: Original positional arguments.
+        @param kwargs: Original keyword arguments.
+
+        @return: new arguments and kwarguments.
+        """
+        args = list(args)
+        kwargs = kwargs.copy()
+
+        for name_index, name in enumerate(self.all_arguments):
+            # Ok, we've got the name of the argument. Let's find the value
+            # of the argument in our original arguments and replace it
+            # whether it's a positional or a keyword argument.
+            if name_index < len(args):
+                # Must be a positional argument
+                value = args[name_index]
+                args[name_index] = self.argument_replacer(name, value)
+            else:
+                # Must be a keyword argument
+                if name not in kwargs:
+                    # Oh, but it wasn't passed in. Ignore it.
+                    continue
+                value = kwargs[name]
+                kwargs[name] = self.argument_replacer(name, value)
+        return args, kwargs
+
+
+def coerce_arguments(**schemas):
+    """
+    A decorator factory which returns a decorator which coerces arguments.
+    """
+    def replacer(name, value):
+        if name in schemas:
+            return schemas[name].coerce(value)
+        return value
+
+    def decorator(original):
+        argument_replacer = ArgumentReplacer(original, replacer)
+        def replacement(*args, **kwargs):
+            new_args, new_kwargs = argument_replacer.replace_arguments(args,
+                                                                       kwargs)
+            return original(*new_args, **new_kwargs)
+        merge_function_metadata(original, replacement)
+        return replacement
+
+    return decorator
 
=== added file 'checkbox/attribute.py'
--- checkbox/attribute.py	1970-01-01 00:00:00 +0000
+++ checkbox/attribute.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,41 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2008 Canonical Ltd.
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+#
+from checkbox.variables import Variable
+
+
+class Attribute:
+
+    def __init__(self, name, cls, variable_factory=None):
+        self.name = name
+        self.cls = cls
+        self.variable_factory = variable_factory or Variable
+
+
+def get_attributes(cls):
+    if "__checkbox_attributes__" in cls.__dict__:
+        return cls.__dict__["__checkbox_attributes__"]
+    else:
+        attributes = {}
+        for name in dir(cls):
+            attribute = getattr(cls, name, None)
+            if isinstance(attribute, Attribute):
+                attributes[name] = attribute
+
+        cls.__checkbox_attributes__ = attributes
+        return cls.__checkbox_attributes__
 
=== added file 'checkbox/component.py'
--- checkbox/component.py	1970-01-01 00:00:00 +0000
+++ checkbox/component.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,184 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2008 Canonical Ltd.
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+#
+import os
+import re
+import itertools
+import logging
+import posixpath
+
+from checkbox.lib.cache import cache
+from checkbox.lib.path import path_expand_recursive
+
+from checkbox.properties import List, String
+from checkbox.variables import get_variables
+
+
+class ComponentSection:
+    """
+    Component section which is essentially a container of modules. These
+    map to the modules referenced in the configuration passed as argument
+    to the constructor.
+    """
+
+    modules = List(type=String())
+    whitelist = List(type=String(), default_factory=lambda:"")
+    blacklist = List(type=String(), default_factory=lambda:"")
+
+    def __init__(self, config, name):
+        """
+        Constructor which takes a configuration instance and name as
+        argument. The former is expected to contain modules.
+        """
+        self._config = config
+        self.name = name
+
+        self.modules = config.modules
+        self.whitelist = config.get("whitelist")
+        self.blacklist = config.get("blacklist")
+
+    @cache
+    def get_names(self):
+        """
+        Get all the module names contained in the filenames or directories
+        for this section.
+        """
+        whitelist_patterns = [re.compile(r"^%s$" % r) for r in self.whitelist]
+        blacklist_patterns = [re.compile(r"^%s$" % r) for r in self.blacklist]
+
+        # Determine names
+        names = set()
+        filenames = itertools.chain(*[path_expand_recursive(m)
+            for m in self.modules])
+        for filename in filenames:
+            name = posixpath.basename(filename)
+            if not name.endswith(".py") or name == "__init__.py":
+                # Ignore silently
+                continue
+
+            name = name.replace(".py", "")
+            if whitelist_patterns:
+                if not [name for p in whitelist_patterns if p.match(name)]:
+                    logging.info("Not whitelisted module: %s", name)
+                    continue
+            elif blacklist_patterns:
+                if [name for p in blacklist_patterns if p.match(name)]:
+                    logging.info("Blacklisted module: %s", name)
+                    continue
+
+            names.add(name)
+
+        return list(names)
+
+    def has_module(self, name):
+        """
+        Check if the given name is in this section.
+        """
+        return name in self.get_names()
+
+    def load_module(self, name):
+        """
+        Load a single module by name from this section.
+        """
+        logging.info("Loading module %s from section %s",
+            name, self.name)
+
+        if not self.has_module(name):
+            raise Exception("No such such module: %s" % name)
+
+        filenames = itertools.chain(*[path_expand_recursive(m)
+            for m in self.modules])
+        for filename in filenames:
+            if filename.endswith(".py") and posixpath.exists(filename):
+                basename = posixpath.basename(filename)
+                basename = basename.replace(".py", "")
+                if basename == name:
+                    globals = {}
+                    exec(open(filename).read(), globals)
+                    if "factory" not in globals:
+                        raise Exception("Variable 'factory' not found in: %s" \
+                            % filename)
+
+                    module = globals["factory"]()
+                    module.__module__ = name
+
+                    config_name = "/".join([self.name, name])
+                    config = self._config.parent.get_section(config_name)
+
+                    # Set configuration values
+                    variables = get_variables(module)
+                    environ = dict([(k.lower(), v) for k, v in os.environ.items()])
+                    for attribute, variable in variables.items():
+                        if config and attribute.name in config:
+                            value = config.get(attribute.name)
+                            variable.set(value)
+                        else:
+                            value = variable.get()
+                            if isinstance(value, str):
+                                value = value % environ
+                                variable.set(value)
+                            elif isinstance(value, list):
+                                value = [v % environ for v in value]
+                                variable.set(value)
+
+                    # Check required attributes
+                    for attribute, variable in variables.items():
+                        value = variable.get()
+                        if value is None and variable._required:
+                            raise Exception("Configuration '%s' missing " \
+                                "required attribute: %s" \
+                                % (config_name, attribute.name))
+
+                    return module
+
+        raise Exception("Failed to find module '%s' in: %s" % (name, filenames))
+
+    def load_modules(self):
+        """
+        Load all modules contained in this section.
+        """
+        modules = []
+        for name in self.get_names():
+            module = self.load_module(name)
+            modules.append(module)
+
+        return modules
+
+
+class ComponentManager:
+    """
+    Component manager which is essentially a container of sections.
+    """
+
+    _section_factory = ComponentSection
+
+    def __init__(self, config):
+        """
+        Constructor which takes a configuration instance as argument. This
+        will be used to load sections by name.
+        """
+        self._config = config
+
+    def load_section(self, name):
+        """
+        Load a section by name which must correspond to a module in the
+        configuration instance pased as argument to the constructor.
+        """
+        logging.info("Loading component section %s", name)
+        config = self._config.get_section(name)
+        return self._section_factory(config, name)
 
=== added directory 'checkbox/contrib'
=== added file 'checkbox/contrib/REThread.py'
--- checkbox/contrib/REThread.py	1970-01-01 00:00:00 +0000
+++ checkbox/contrib/REThread.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,142 @@
+'''Enhanced threading.Thread which can deliver a return value and propagate
+exceptions from the called thread to the calling thread.
+
+Copyright (C) 2007 Canonical Ltd.
+Author: Martin Pitt <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+the full text of the license.
+'''
+
+import threading, sys
+
+class REThread(threading.Thread):
+    '''Enhanced threading.Thread which can deliver a return value and propagate
+    exceptions from the called thread to the calling thread.'''
+
+    def __init__(self, group=None, target=None, name=None, args=(), kwargs={},
+            verbose=None):
+        '''Initialize Thread, identical to threading.Thread.__init__().'''
+        #Note that due to api differences in python (verbose disappeared
+        #at some point before 3.3 and got replaced by daemon), we just
+        #ignore the verbose attribute. It's not used anywhere in checkbox
+        #so this is safe for our purposes.
+        self.__target = target
+        self.__args = args
+        self.__kwargs = kwargs
+        self._retval = None
+        self._exception = None
+
+        threading.Thread.__init__(self)
+
+    def run(self):
+        '''Run target function, identical to threading.Thread.run().'''
+
+        if self.__target:
+            try:
+                self._retval = self.__target(*self.__args, **self.__kwargs)
+            except:
+                self._exception = sys.exc_info()
+
+    def return_value(self):
+        '''Return value from target function.
+
+        This can only be called after the thread has finished, i. e. when
+        isAlive() is False and did not terminate with an exception.'''
+
+        assert not self.isAlive()
+        assert not self._exception
+        return self._retval
+
+    def exc_info(self):
+        '''Return a tuple (type, value, traceback) of the exception caught in
+        run().'''
+
+        return self._exception
+
+    def exc_raise(self):
+        '''Raises the exception caught in the thread.
+
+        Does nothing if no exception was caught.'''
+
+        if self._exception:
+            raise self._exception[0](self._exception[1]).with_traceback(self._exception[2])
+
+#
+# Unit test
+#
+
+if __name__ == '__main__':
+    import unittest, time, traceback, exceptions
+
+    def idle(seconds):
+        '''Test thread to just wait a bit.'''
+
+        time.sleep(seconds)
+
+    def div(x, y):
+        '''Test thread to divide two numbers.'''
+
+        return x / y
+
+    class _REThreadTest(unittest.TestCase):
+        def test_return_value(self):
+            '''Test that return value works properly.'''
+
+            t = REThread(target=div, args=(42, 2))
+            t.start()
+            t.join()
+            # exc_raise() should be a no-op on successful functions
+            t.exc_raise()
+            self.assertEqual(t.return_value(), 21)
+            self.assertEqual(t.exc_info(), None)
+
+        def test_no_return_value(self):
+            '''Test that REThread works if run() does not return anything.'''
+
+            t = REThread(target=idle, args=(0.5,))
+            t.start()
+            # thread must be joined first
+            self.assertRaises(AssertionError, t.return_value)
+            t.join()
+            self.assertEqual(t.return_value(), None)
+            self.assertEqual(t.exc_info(), None)
+
+        def test_exception(self):
+            '''Test that exception in thread is caught and passed.'''
+
+            t = REThread(target=div, args=(1, 0))
+            t.start()
+            t.join()
+            # thread did not terminate normally, no return value
+            self.assertRaises(AssertionError, t.return_value)
+            self.assert_(t.exc_info()[0] == exceptions.ZeroDivisionError)
+            exc = traceback.format_exception(t.exc_info()[0], t.exc_info()[1],
+                t.exc_info()[2])
+            self.assert_(exc[-1].startswith('ZeroDivisionError'))
+            self.assert_(exc[-2].endswith('return x / y\n'))
+
+        def test_exc_raise(self):
+            '''Test that exc_raise() raises caught thread exception.'''
+
+            t = REThread(target=div, args=(1, 0))
+            t.start()
+            t.join()
+            # thread did not terminate normally, no return value
+            self.assertRaises(AssertionError, t.return_value)
+            raised = False
+            try:
+                t.exc_raise()
+            except:
+                raised = True
+                e = sys.exc_info()
+                exc = traceback.format_exception(e[0], e[1], e[2])
+                self.assert_(exc[-1].startswith('ZeroDivisionError'))
+                self.assert_(exc[-2].endswith('return x / y\n'))
+            self.assert_(raised)
+
+    unittest.main()
+
 
=== added file 'checkbox/contrib/__init__.py'
=== added file 'checkbox/contrib/bpickle.py'
--- checkbox/contrib/bpickle.py	1970-01-01 00:00:00 +0000
+++ checkbox/contrib/bpickle.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,188 @@
+"""
+Copyright (c) 2006, Gustavo Niemeyer <[e-mail]>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""
+
+
+dumps_table = {}
+loads_table = {}
+
+
+def dumps(obj, _dt=None):
+    if not _dt:
+        _dt = dumps_table
+
+    type_names = [type(obj)]
+    for type_name in type_names:
+        if type_name in _dt:
+            return _dt[type_name](obj)
+
+        type_names.extend(type_name.__bases__)
+
+    raise ValueError("Unsupported type: %s" % type(obj))
+
+
+def loads(str, _lt=loads_table):
+    if not str:
+        raise ValueError("Can't load empty string")
+    try:
+        return _lt[str[0]](str, 0)[0]
+    except KeyError as e:
+        raise ValueError("Unknown type character: %s" % e)
+    except IndexError:
+        raise ValueError("Corrupted data")
+
+
+def dumps_bool(obj):
+    return ("b%d" % int(obj)).encode("ascii")
+
+
+def dumps_int(obj):
+    return ("i%s;" % obj).encode("ascii")
+
+
+def dumps_float(obj):
+    return ("f%r;" % obj).encode("ascii")
+
+
+def dumps_bytes(obj):
+    return ("c%s:" % len(obj)).encode("ascii") + obj
+
+
+def dumps_str(obj):
+    obj = obj.encode("utf-8")
+    return ("s%s:" % len(obj)).encode("ascii") + obj
+
+
+def dumps_list(obj, _dt=None):
+    return b"l" + b"".join([dumps(val, _dt) for val in obj]) + b";"
+
+
+def dumps_tuple(obj, _dt=None):
+    return b"t" + b"".join([dumps(val, _dt) for val in obj]) + b";"
+
+
+def dumps_dict(obj, _dt=None):
+    res = []
+    keys = sorted(obj.keys())
+    append = res.append
+    for key in keys:
+        val = obj[key]
+        append(dumps(key, _dt))
+        append(dumps(val, _dt))
+    return b"d" + b"".join(res) + b";"
+
+
+def dumps_none(obj):
+    return b"n"
+
+
+def loads_bool(str, pos):
+    return bool(int(chr(str[pos + 1]))), pos + 2
+
+
+def loads_int(str, pos):
+    endpos = str.index(b";", pos)
+    return int(str[pos + 1:endpos]), endpos + 1
+
+
+def loads_float(str, pos):
+    endpos = str.index(b";", pos)
+    return float(str[pos + 1:endpos]), endpos + 1
+
+
+def loads_bytes(str, pos):
+    startpos = str.index(b":", pos) + 1
+    endpos = startpos + int(str[pos + 1:startpos - 1])
+    return str[startpos:endpos], endpos
+
+
+def loads_str(str, pos):
+    startpos = str.index(b":", pos) + 1
+    endpos = startpos + int(str[pos + 1:startpos - 1])
+    return str[startpos:endpos].decode("utf-8"), endpos
+
+
+def loads_list(str, pos, _lt=loads_table):
+    pos += 1
+    res = []
+    append = res.append
+    while str[pos] != ord(";"):
+        obj, pos = _lt[str[pos]](str, pos)
+        append(obj)
+    return res, pos + 1
+
+
+def loads_tuple(str, pos, _lt=loads_table):
+    pos += 1
+    res = []
+    append = res.append
+    while str[pos] != ord(";"):
+        obj, pos = _lt[str[pos]](str, pos)
+        append(obj)
+    return tuple(res), pos + 1
+
+
+def loads_dict(str, pos, _lt=loads_table):
+    pos += 1
+    res = {}
+    while str[pos] != ord(";"):
+        key, pos = _lt[str[pos]](str, pos)
+        val, pos = _lt[str[pos]](str, pos)
+        res[key] = val
+    return res, pos + 1
+
+
+def loads_none(str, pos):
+    return None, pos + 1
+
+
+dumps_table.update({
+    bool: dumps_bool,
+    int: dumps_int,
+    float: dumps_float,
+    bytes: dumps_bytes,
+    str: dumps_str,
+    list: dumps_list,
+    tuple: dumps_tuple,
+    dict: dumps_dict,
+    type(None): dumps_none,
+    })
+
+loads_table.update({
+    ord("b"): loads_bool,
+    ord("i"): loads_int,
+    ord("f"): loads_float,
+    ord("c"): loads_str,
+    ord("s"): loads_str,
+    ord("u"): loads_str,
+    ord("l"): loads_list,
+    ord("t"): loads_tuple,
+    ord("d"): loads_dict,
+    ord("n"): loads_none,
+    })
 
=== added file 'checkbox/contrib/gdk.py'
--- checkbox/contrib/gdk.py	1970-01-01 00:00:00 +0000
+++ checkbox/contrib/gdk.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,46 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+#
+# Python-XRandR provides a high level API for the XRandR extension of the
+# X.org server. XRandR allows to configure resolution, refresh rate, rotation
+# of the screen and multiple outputs of graphics cards.
+#
+# This module allows to get information for gtk.gdk.Screen objects
+#
+# In many aspects it follows the design of the xrand tool written by
+# Keith Packard.
+#
+# Copyright 2007 © Sebastian Heinlein <[e-mail]>
+#
+# 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 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
+
+from gi.repository import Gdk
+from checkbox.contrib import xrandr
+
+#FIXME: Perhaps using gdk_x11_screen_get_xscreen would be more elegant
+
+def get_default_screen_config():
+    dpy = Gdk.Display.get_default()
+    screen = Gdk.Display.get_default_screen(dpy)
+    return get_screen_config(screen)
+
+def get_screen_config(screen):
+    """Returns the XRandR screen config instance for the given gtk.gdk.Screen"""
+    dpy = screen.get_display()
+    dpy_url = dpy.get_name()
+    count = screen.get_number()
+    return xrandr.get_screen_of_display(dpy_url, count)
+
+# vim:ts=4:sw=4:et
 
=== added file 'checkbox/contrib/glock.py'
--- checkbox/contrib/glock.py	1970-01-01 00:00:00 +0000
+++ checkbox/contrib/glock.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,311 @@
+#!/usr/bin/env python3
+# -*- coding: latin1 -*-
+#----------------------------------------------------------------------------
+# glock.py:                 Global mutex
+#
+# See __doc__ string below.
+#
+# Requires:
+#    - Python 1.5.2 or newer (www.python.org)
+#    - On windows: win32 extensions installed
+#           (http://www.python.org/windows/win32all/win32all.exe)
+#    - OS: Unix, Windows.
+#
+# $Id: //depot/rgutils/rgutils/glock.py#5 $
+#----------------------------------------------------------------------------
+'''
+This module defines the class GlobalLock that implements a global
+(inter-process) mutex on Windows and Unix, using file-locking on
+Unix.
+
+@see: class L{GlobalLock} for more details.
+'''
+__version__ = '0.2.' + '$Revision: #5 $'[12:-2]
+__author__ = 'Richard Gruet', '[e-mail]'
+__date__    = '$Date: 2005/06/19 $'[7:-2], '$Author: rgruet $'[9:-2]
+__since__ = '2000-01-22'
+__doc__ += '\n@author: %s (U{%s})\n@version: %s' % (__author__[0],
+                                            __author__[1], __version__)
+__all__ = ['GlobalLock', 'GlobalLockError', 'LockAlreadyAcquired', 'NotOwner']
+
+# Imports:
+import sys, string, os, errno, re, posixpath
+
+# System-dependent imports for locking implementation:
+_windows = (sys.platform == 'win32')
+
+if _windows:
+    try:
+        import win32event, win32api, pywintypes
+    except ImportError:
+        sys.stderr.write('The win32 extensions need to be installed!')
+    try:
+        import ctypes
+    except ImportError:
+        ctypes = None
+else:   # assume Unix
+    try:
+        import fcntl
+    except ImportError:
+        sys.stderr.write("On what kind of OS am I ? (Mac?) I should be on "
+                         "Unix but can't import fcntl.\n")
+        raise
+    import threading
+
+# Exceptions :
+# ----------
+class GlobalLockError(Exception):
+    ''' Error raised by the glock module.
+    '''
+    pass
+
+class NotOwner(GlobalLockError):
+    ''' Attempt to release somebody else's lock.
+    '''
+    pass
+
+class LockAlreadyAcquired(GlobalLockError):
+    ''' Non-blocking acquire but lock already seized.
+    '''
+    pass
+
+
+#----------------------------------------------------------------------------
+class GlobalLock:
+#----------------------------------------------------------------------------
+    ''' A global mutex.
+
+        B{Specification}
+
+         - The lock must act as a global mutex, ie block between different
+           candidate processus, but ALSO between different candidate
+           threads of the same process.
+
+         - It must NOT block in case of reentrant lock request issued by
+           the SAME thread.
+         - Extraneous unlocks should be ideally harmless.
+
+        B{Implementation}
+
+        In Python there is no portable global lock AFAIK. There is only a
+        LOCAL/ in-process Lock mechanism (threading.RLock), so we have to
+        implement our own solution:
+
+         - Unix: use fcntl.flock(). Recursive calls OK. Different process OK.
+           But <> threads, same process don't block so we have to use an extra
+           threading.RLock to fix that point.
+         - Windows: We use WIN32 mutex from Python Win32 extensions. Can't use
+           std module msvcrt.locking(), because global lock is OK, but
+           blocks also for 2 calls from the same thread!
+    '''
+    RE_ERROR_MSG = re.compile ("^\[Errno ([0-9]+)\]")
+
+    def __init__(self, fpath, lockInitially=False, logger=None):
+        ''' Creates (or opens) a global lock.
+
+            @param fpath: Path of the file used as lock target. This is also
+                          the global id of the lock. The file will be created
+                          if non existent.
+            @param lockInitially: if True locks initially.
+            @param logger: an optional logger object.
+        '''
+        self.logger = logger
+        self.fpath = fpath
+        if posixpath.exists(fpath):
+            self.previous_lockfile_present = True
+        else:
+            self.previous_lockfile_present = False
+        if _windows:
+            self.name = string.replace(fpath, '\\', '_')
+            self.mutex = win32event.CreateMutex(None, lockInitially, self.name)
+        else: # Unix
+            self.name = fpath
+            self.flock = open(fpath, 'w')
+            self.fdlock = self.flock.fileno()
+            self.threadLock = threading.RLock()
+        if lockInitially:
+            self.acquire()
+
+    def __del__(self):
+        #print '__del__ called' ##
+        try: self.release()
+        except: pass
+        if _windows:
+            win32api.CloseHandle(self.mutex)
+        else:
+            try: self.flock.close()
+            except: pass
+
+    def __repr__(self):
+        return '<Global lock @ %s>' % self.name
+
+    def acquire(self, blocking=False):
+        """ Locks. Attemps to acquire a lock.
+
+            @param blocking: If True, suspends caller until done. Otherwise,
+            LockAlreadyAcquired is raised if the lock cannot be acquired immediately.
+
+            On windows an IOError is always raised after ~10 sec if the lock
+            can't be acquired.
+            @exception GlobalLockError: if lock can't be acquired (timeout)
+            @exception LockAlreadyAcquired: someone already has the lock and
+                       the caller decided not to block.
+        """
+        if self.logger:
+            self.logger.info('creating lockfile')
+        if _windows:
+            if blocking:
+                timeout = win32event.INFINITE
+            else:
+                timeout = 0
+            r = win32event.WaitForSingleObject(self.mutex, timeout)
+            if r == win32event.WAIT_FAILED:
+                raise GlobalLockError("Can't acquire mutex: error")
+            if not blocking and r == win32event.WAIT_TIMEOUT:
+                raise LockAlreadyAcquired('Lock %s already acquired by '
+                                          'someone else' % self.name)
+        else:
+            # First, acquire the global (inter-process) lock:
+            if blocking:
+                options = fcntl.LOCK_EX
+            else:
+                options = fcntl.LOCK_EX|fcntl.LOCK_NB
+            try:
+                fcntl.flock(self.fdlock, options)
+            except IOError as message: #(errno 13: perm. denied,
+                            #       36: Resource deadlock avoided)
+                if not blocking and self._errnoOf (message) == errno.EWOULDBLOCK:
+                    raise LockAlreadyAcquired('Lock %s already acquired by '
+                                              'someone else' % self.name)
+                else:
+                    raise GlobalLockError('Cannot acquire lock on "file" '
+                                          '%s: %s\n' % (self.name, message))
+            #print 'got file lock.' ##
+
+            # Then acquire the local (inter-thread) lock:
+            if not self.threadLock.acquire(blocking):
+                fcntl.flock(self.fdlock, fcntl.LOCK_UN) # release global lock
+                raise LockAlreadyAcquired('Lock %s already acquired by '
+                                          'someone else' % self.name)
+            if self.previous_lockfile_present and self.logger:
+                self.logger.warn("Stale lockfile detected and claimed.")
+            #print 'got thread lock.' ##
+
+        self.is_locked = True
+
+    def release(self, skip_delete=False):
+        ''' Unlocks. (caller must own the lock!)
+
+            @param skip_delete: don't try to delete the file. This can
+                be used when the original filename has changed; for
+                instance, if the lockfile is erased out-of-band, or if
+                the directory it contains has been renamed.
+
+            @return: The lock count.
+            @exception IOError: if file lock can't be released
+            @exception NotOwner: Attempt to release somebody else's lock.
+        '''
+        if not self.is_locked:
+            return
+        if not skip_delete:
+            if self.logger:
+                self.logger.debug('Removing lock file: %s', self.fpath)
+            os.unlink(self.fpath)
+        elif self.logger:
+            # At certain times the lockfile will have been removed or
+            # moved away before we call release(); log a message because
+            # this is unusual and could be an error.
+            self.logger.debug('Oops, my lock file disappeared: %s', self.fpath)
+        if _windows:
+            if ctypes:
+                result = ctypes.windll.kernel32.ReleaseMutex(self.mutex.handle)
+                if not result:
+                   raise NotOwner("Attempt to release somebody else's lock")
+            else:
+                try:
+                    win32event.ReleaseMutex(self.mutex)
+                    #print "released mutex"
+                except pywintypes.error as e:
+                    errCode, fctName, errMsg =  e.args
+                    if errCode == 288:
+                        raise NotOwner("Attempt to release somebody else's lock")
+                    else:
+                        raise GlobalLockError('%s: err#%d: %s' % (fctName, errCode,
+                                                                  errMsg))
+        else:
+            # First release the local (inter-thread) lock:
+            try:
+                self.threadLock.release()
+            except AssertionError:
+                raise NotOwner("Attempt to release somebody else's lock")
+
+            # Then release the global (inter-process) lock:
+            try:
+                fcntl.flock(self.fdlock, fcntl.LOCK_UN)
+            except IOError: # (errno 13: permission denied)
+                raise GlobalLockError('Unlock of file "%s" failed\n' %
+                                                            self.name)
+        self.is_locked = False
+
+    def _errnoOf (self, message):
+        match = self.RE_ERROR_MSG.search(str(message))
+        if match:
+            return int(match.group(1))
+        else:
+            raise Exception ('Malformed error message "%s"' % message)
+
+#----------------------------------------------------------------------------
+def test():
+#----------------------------------------------------------------------------
+    ##TODO: a more serious test with distinct processes !
+
+    print('Testing glock.py...')
+
+    # unfortunately can't test inter-process lock here!
+    lockName = 'myFirstLock'
+    l = GlobalLock(lockName)
+    if not _windows:
+        assert posixpath.exists(lockName)
+    l.acquire()
+    l.acquire() # reentrant lock, must not block
+    l.release()
+    l.release()
+
+    try: l.release()
+    except NotOwner: pass
+    else: raise Exception('should have raised a NotOwner exception')
+
+    # Check that <> threads of same process do block:
+    import threading, time
+    thread = threading.Thread(target=threadMain, args=(l,))
+    print('main: locking...', end=' ')
+    l.acquire()
+    print(' done.')
+    thread.start()
+    time.sleep(3)
+    print('\nmain: unlocking...', end=' ')
+    l.release()
+    print(' done.')
+    time.sleep(0.1)
+
+    print('=> Test of glock.py passed.')
+    return l
+
+def threadMain(lock):
+    print('thread started(%s).' % lock)
+    try: lock.acquire(blocking=False)
+    except LockAlreadyAcquired: pass
+    else: raise Exception('should have raised LockAlreadyAcquired')
+    print('thread: locking (should stay blocked for ~ 3 sec)...', end=' ')
+    lock.acquire()
+    print('thread: locking done.')
+    print('thread: unlocking...', end=' ')
+    lock.release()
+    print(' done.')
+    print('thread ended.')
+
+#----------------------------------------------------------------------------
+#       M A I N
+#----------------------------------------------------------------------------
+if __name__ == "__main__":
+    l = test()
 
=== added file 'checkbox/contrib/persist.py'
--- checkbox/contrib/persist.py	1970-01-01 00:00:00 +0000
+++ checkbox/contrib/persist.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,552 @@
+# Copyright (c) 2006 Canonical
+# Copyright (c) 2004 Conectiva, Inc.
+#
+# Written by Gustavo Niemeyer <[e-mail]>
+#
+# This Python module is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
+#
+# This Python module 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
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this Python module; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+import os
+import sys
+import copy
+import re
+import posixpath
+
+from checkbox.lib.safe import safe_close
+
+__all__ = ["Persist", "MemoryBackend", "PickleBackend", "BPickleBackend",
+    "path_string_to_tuple", "path_tuple_to_string", "RootedPersist",
+    "PersistError", "PersistReadOnlyError"]
+
+
+NOTHING = object()
+
+
+class PersistError(Exception):
+    pass
+
+
+class PersistReadOnlyError(PersistError):
+    pass
+
+
+class Persist:
+    """Persistence handler.
+
+    There are three different kinds of opition maps, regarding the
+    persistence and priority that maps are queried.
+
+    hard - Options are persistent.
+    soft - Options are not persistent, and have a higher priority
+           than persistent options.
+    weak - Options are not persistent, and have a lower priority
+           than persistent options.
+
+    @ivar filename: The name of the file where persist data is saved
+        or None if not filename is available.
+    """
+
+
+    def __init__(self, filename=None, backend=None):
+        """
+        @param backend: The backend to use. If none is specified,
+            L{BPickleBackend} will be used.
+        @param filename: The default filename to save to and load from. If
+            specified, and the file exists, it will be immediately
+            loaded. Specifying this will also allow L{save} to be called
+            without any arguments to save the persist.
+        """
+        if backend is None:
+            backend = BPickleBackend()
+        self._backend = backend
+        self._hardmap = backend.new()
+        self._softmap = {}
+        self._weakmap = {}
+        self._readonly = False
+        self._modified = False
+        self.filename = filename
+        if filename is not None and posixpath.exists(filename):
+            self.load(filename)
+
+    def _get_readonly(self):
+        return self._readonly
+
+    def _set_readonly(self, flag):
+        self._readonly = bool(flag)
+
+    def _get_modified(self):
+        return self._modified
+
+    readonly = property(_get_readonly, _set_readonly)
+    modified = property(_get_modified)
+
+    def reset_modified(self):
+        self._modified = False
+
+    def assert_writable(self):
+        if self._readonly:
+            raise PersistReadOnlyError("Configuration is in readonly mode.")
+
+    def load(self, filepath):
+        filepath = posixpath.expanduser(filepath)
+        if not posixpath.isfile(filepath):
+            raise PersistError("File not found: %s" % filepath)
+        if posixpath.getsize(filepath) == 0:
+            return
+        try:
+            self._hardmap = self._backend.load(filepath)
+        except:
+            filepathold = filepath+".old"
+            if (posixpath.isfile(filepathold) and
+                posixpath.getsize(filepathold) > 0):
+                # warning("Broken configuration file at %s" % filepath)
+                # warning("Trying backup at %s" % filepathold)
+                try:
+                    self._hardmap = self._backend.load(filepathold)
+                except:
+                    raise PersistError("Broken configuration file at %s" %
+                                       filepathold)
+            else:
+                raise PersistError("Broken configuration file at %s" %
+                                   filepath)
+
+    def save(self, filepath=None):
+        """Save the persist to the given C{filepath}.
+
+        If None is specified, then the filename passed during construction will
+        be used.
+        """
+        if filepath is None:
+            if self.filename is None:
+                return
+            filepath = self.filename
+        filepath = posixpath.expanduser(filepath)
+        if posixpath.isfile(filepath):
+            os.rename(filepath, filepath+".old")
+        dirname = posixpath.dirname(filepath)
+        if dirname and not posixpath.isdir(dirname):
+            os.makedirs(dirname)
+        self._backend.save(filepath, self._hardmap)
+
+    def _traverse(self, obj, path, default=NOTHING, setvalue=NOTHING):
+        if setvalue is not NOTHING:
+            setvalue = self._backend.copy(setvalue)
+        queue = list(path)
+        marker = NOTHING
+        newobj = obj
+        while queue:
+            obj = newobj
+            elem = queue.pop(0)
+            newobj = self._backend.get(obj, elem)
+            if newobj is NotImplemented:
+                if queue:
+                    path = path[:-len(queue)]
+                raise PersistError("Can't traverse %r (%r): %r" %
+                                   (type(obj), path_tuple_to_string(path),
+                                    str(obj)))
+            if newobj is marker:
+                break
+        if newobj is not marker:
+            if setvalue is not marker:
+                newobj = self._backend.set(obj, elem, setvalue)
+        else:
+            if setvalue is marker:
+                newobj = default
+            else:
+                while True:
+                    if len(queue) > 0:
+                        if type(queue[0]) is int:
+                            newvalue = []
+                        else:
+                            newvalue = {}
+                    else:
+                        newvalue = setvalue
+                    newobj = self._backend.set(obj, elem, newvalue)
+                    if newobj is NotImplemented:
+                        raise PersistError("Can't traverse %r with %r" %
+                                           (type(obj), type(elem)))
+                    if not queue:
+                        break
+                    obj = newobj
+                    elem = queue.pop(0)
+        return newobj
+
+    def _getvalue(self, path, soft=False, hard=False, weak=False):
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        marker = NOTHING
+        if soft:
+            value = self._traverse(self._softmap, path, marker)
+        elif hard:
+            value = self._traverse(self._hardmap, path, marker)
+        elif weak:
+            value = self._traverse(self._weakmap, path, marker)
+        else:
+            value = self._traverse(self._softmap, path, marker)
+            if value is marker:
+                value = self._traverse(self._hardmap, path, marker)
+                if value is marker:
+                    value = self._traverse(self._weakmap, path, marker)
+        return value
+
+    def has(self, path, value=NOTHING, soft=False, hard=False, weak=False):
+        obj = self._getvalue(path, soft, hard, weak)
+        marker = NOTHING
+        if obj is marker:
+            return False
+        elif value is marker:
+            return True
+        result = self._backend.has(obj, value)
+        if result is NotImplemented:
+            raise PersistError("Can't check %r for containment" % type(obj))
+        return result
+
+    def keys(self, path, soft=False, hard=False, weak=False):
+        obj = self._getvalue(path, soft, hard, weak)
+        if obj is NOTHING:
+            return []
+        result = self._backend.keys(obj)
+        if result is NotImplemented:
+            raise PersistError("Can't return keys for %s" % type(obj))
+        return result
+
+    def get(self, path, default=None, soft=False, hard=False, weak=False):
+        value = self._getvalue(path, soft, hard, weak)
+        if value is NOTHING:
+            return default
+        return self._backend.copy(value)
+
+    def set(self, path, value, soft=False, weak=False):
+        assert path
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        if soft:
+            map = self._softmap
+        elif weak:
+            map = self._weakmap
+        else:
+            self.assert_writable()
+            self._modified = True
+            map = self._hardmap
+        self._traverse(map, path, setvalue=value)
+
+    def add(self, path, value, unique=False, soft=False, weak=False):
+        assert path
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        if soft:
+            map = self._softmap
+        elif weak:
+            map = self._weakmap
+        else:
+            self.assert_writable()
+            self._modified = True
+            map = self._hardmap
+        if unique:
+            current = self._traverse(map, path)
+            if type(current) is list and value in current:
+                return
+        path = path+(sys.maxsize,)
+        self._traverse(map, path, setvalue=value)
+
+    def remove(self, path, value=NOTHING, soft=False, weak=False):
+        assert path
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        if soft:
+            map = self._softmap
+        elif weak:
+            map = self._weakmap
+        else:
+            self.assert_writable()
+            self._modified = True
+            map = self._hardmap
+        marker = NOTHING
+        while path:
+            if value is marker:
+                obj = self._traverse(map, path[:-1])
+                elem = path[-1]
+                isvalue = False
+            else:
+                obj = self._traverse(map, path)
+                elem = value
+                isvalue = True
+            result = False
+            if obj is not marker:
+                result = self._backend.remove(obj, elem, isvalue)
+                if result is NotImplemented:
+                    raise PersistError("Can't remove %r from %r" %
+                                       (elem, type(obj)))
+            if self._backend.empty(obj):
+                if value is not marker:
+                    value = marker
+                else:
+                    path = path[:-1]
+            else:
+                break
+        return result
+
+    def move(self, oldpath, newpath, soft=False, weak=False):
+        if not (soft or weak):
+            self.assert_writable()
+        if type(oldpath) is str:
+            oldpath = path_string_to_tuple(oldpath)
+        if type(newpath) is str:
+            newpath = path_string_to_tuple(newpath)
+        result = False
+        marker = NOTHING
+        value = self._getvalue(oldpath, soft, not (soft or weak), weak)
+        if value is not marker:
+            self.remove(oldpath, soft=soft, weak=weak)
+            self.set(newpath, value, weak, soft)
+            result = True
+        return result
+
+    def root_at(self, path):
+        return RootedPersist(self, path)
+
+
+class RootedPersist:
+
+    def __init__(self, parent, root):
+        self.parent = parent
+        if type(root) is str:
+            self.root = path_string_to_tuple(root)
+        else:
+            self.root = root
+
+    readonly = property(lambda self: self.parent.readonly)
+    modified = property(lambda self: self.parent.modified)
+
+    def assert_writable(self):
+        self.parent.assert_writable()
+
+    def save(self):
+        self.parent.save()
+
+    def has(self, path, value=NOTHING, soft=False, hard=False, weak=False):
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        return self.parent.has(self.root+path, value, soft, hard, weak)
+
+    def keys(self, path, soft=False, hard=False, weak=False):
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        return self.parent.keys(self.root+path, soft, hard, weak)
+
+    def get(self, path, default=None, soft=False, hard=False, weak=False):
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        return self.parent.get(self.root+path, default, soft, hard, weak)
+
+    def set(self, path, value, soft=False, weak=False):
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        return self.parent.set(self.root+path, value, soft, weak)
+
+    def add(self, path, value, unique=False, soft=False, weak=False):
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        return self.parent.add(self.root+path, value, unique, soft, weak)
+
+    def remove(self, path, value=NOTHING, soft=False, weak=False):
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        return self.parent.remove(self.root+path, value, soft, weak)
+
+    def move(self, oldpath, newpath, soft=False, weak=False):
+        if type(oldpath) is str:
+            oldpath = path_string_to_tuple(oldpath)
+        if type(newpath) is str:
+            newpath = path_string_to_tuple(newpath)
+        return self.parent.move(self.root+oldpath, self.root+newpath,
+                                soft, weak)
+
+    def root_at(self, path):
+        if type(path) is str:
+            path = path_string_to_tuple(path)
+        return self.parent.root_at(self.root+path)
+
+
+_splitpath = re.compile(r"(\[-?\d+\])|(?<!\\)\.").split
+
+def path_string_to_tuple(path):
+    if "." not in path and "[" not in path:
+        return (path,)
+    result = []
+    tokens = _splitpath(path)
+    for token in tokens:
+        if token:
+            if token[0] == "[" and token[-1] == "]":
+                try:
+                    result.append(int(token[1:-1]))
+                except ValueError:
+                    raise PersistError("Invalid path index: %r" % token)
+            else:
+                result.append(token.replace(r"\.", "."))
+    return tuple(result)
+
+
+def path_tuple_to_string(path):
+    result = []
+    for elem in path:
+        if type(elem) is int:
+            result[-1] += "[%d]" % elem
+        else:
+            result.append(str(elem).replace(".", "\."))
+    return ".".join(result)
+
+
+class Backend:
+
+    def new(self):
+        return {}
+
+    def load(self, filepath):
+        raise NotImplementedError
+
+    def save(self, filepath, map):
+        raise NotImplementedError
+
+    def get(self, obj, elem, _marker=NOTHING):
+        if type(obj) is dict:
+            newobj = obj.get(elem, _marker)
+        elif type(obj) in (tuple, list):
+            if type(elem) is int:
+                try:
+                    newobj = obj[elem]
+                except IndexError:
+                    newobj = _marker
+            elif elem in obj:
+                newobj = elem
+            else:
+                newobj = _marker
+        else:
+            newobj = NotImplemented
+        return newobj
+
+    def set(self, obj, elem, value):
+        if type(obj) is dict:
+            newobj = obj[elem] = value
+        elif type(obj) is list and type(elem) is int:
+            lenobj = len(obj)
+            if lenobj <= elem:
+                obj.append(None)
+                elem = lenobj
+            elif elem < 0 and abs(elem) > lenobj:
+                obj.insert(0, None)
+                elem = 0
+            newobj = obj[elem] = value
+        else:
+            newobj = NotImplemented
+        return newobj
+
+    def remove(self, obj, elem, isvalue):
+        result = False
+        if type(obj) is dict:
+            if elem in obj:
+                del obj[elem]
+                result = True
+        elif type(obj) is list:
+            if not isvalue and type(elem) is int:
+                try:
+                    del obj[elem]
+                    result = True
+                except IndexError:
+                    pass
+            elif elem in obj:
+                obj[:] = [x for x in obj if x != elem]
+                result = True
+        else:
+            result = NotImplemented
+        return result
+
+    def copy(self, value):
+        if type(value) in (dict, list):
+            return copy.deepcopy(value)
+        return value
+
+    def empty(self, obj):
+        return (not obj)
+
+    def has(self, obj, elem):
+        contains = getattr(obj, "__contains__", None)
+        if contains:
+            return contains(elem)
+        return NotImplemented
+
+    def keys(self, obj):
+        keys = getattr(obj, "keys", None)
+        if keys:
+            return keys()
+        elif type(obj) is list:
+            return list(range(len(obj)))
+        return NotImplemented
+
+
+class MemoryBackend(Backend):
+
+    def __init__(self):
+        self._store = {}
+
+    def load(self, filepath):
+        return self._store.get(filepath)
+
+    def save(self, filepath, map):
+        self._store[filepath] = map
+
+class DiskBackend(Backend):
+
+    safe_file_closing = True
+
+class PickleBackend(DiskBackend):
+
+    def __init__(self):
+        import pickle
+        self._pickle = cPickle
+
+    def load(self, filepath):
+        file = open(filepath, "rb")
+        try:
+            return self._pickle.load(file)
+        finally:
+            safe_close(file, self.safe_file_closing)
+
+    def save(self, filepath, map):
+        file = open(filepath, "wb")
+        try:
+            self._pickle.dump(map, file, 2)
+        finally:
+            safe_close(file, self.safe_file_closing)
+
+
+class BPickleBackend(DiskBackend):
+
+    def __init__(self):
+        from checkbox.contrib import bpickle
+        self._bpickle = bpickle
+
+    def load(self, filepath):
+        file = open(filepath, "rb")
+        try:
+            return self._bpickle.loads(file.read())
+        finally:
+            safe_close(file, self.safe_file_closing)
+
+    def save(self, filepath, map):
+        file = open(filepath, "wb")
+        try:
+            file.write(self._bpickle.dumps(map))
+        finally:
+            safe_close(file, self.safe_file_closing)
 
=== added file 'checkbox/contrib/xrandr.py'
--- checkbox/contrib/xrandr.py	1970-01-01 00:00:00 +0000
+++ checkbox/contrib/xrandr.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,1064 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+#
+# Python-XRandR provides a high level API for the XRandR extension of the
+# X.org server. XRandR allows to configure resolution, refresh rate, rotation
+# of the screen and multiple outputs of graphics cards.
+#
+# Copyright 2007 © Sebastian Heinlein <[e-mail]>
+# Copyright 2007 © Michael Vogt <[e-mail]>
+# Copyright 2007 © Canonical Ltd.
+#
+# In many aspects it follows the design of the xrand tool of the X.org, which
+# comes with the following copyright:
+#
+# Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+# Copyright © 2002 Hewlett Packard Company, Inc.
+# Copyright © 2006 Intel Corporation
+#
+# And can be downloaded here:
+#
+# git://anongit.freedesktop.org/git/xorg/app/xrandr
+#
+# 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 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
+
+from ctypes import (
+    POINTER,
+    Structure,
+    byref,
+    c_char_p,
+    c_void_p,
+    c_int,
+    c_long,
+    c_ulong,
+    c_ushort,
+    cdll,
+)
+import os
+
+RR_ROTATE_0 = 1
+RR_ROTATE_90 = 2
+RR_ROTATE_180 = 4
+RR_ROTATE_270 = 8
+RR_REFLECT_X = 16
+RR_REFLECT_Y = 32
+
+RR_CONNECTED = 0
+RR_DISCONNECTED = 1
+RR_UNKOWN_CONNECTION = 2
+
+RR_BAD_OUTPUT = 0
+RR_BAD_CRTC = 1
+RR_BAD_MODE = 2
+
+RR_SET_CONFIG_SUCCESS = 0
+RR_SET_CONFIG_INVALID_CONFIG_TIME = 1
+RR_SET_CONFIG_INVALID_TIME = 2
+RR_SET_CONFIG_FAILED = 3
+
+# Flags to keep track of changes
+CHANGES_NONE = 0
+CHANGES_CRTC = 1
+CHANGES_MODE = 2
+CHANGES_RELATION = 4
+CHANGES_POSITION = 8
+CHANGES_ROTATION = 16
+CHANGES_REFLECTION = 32
+CHANGES_AUTOMATIC = 64
+CHANGES_REFRESH = 128
+CHANGES_PROPERTY = 256
+
+# Relation information
+RELATION_ABOVE = 0
+RELATION_BELOW = 1
+RELATION_RIGHT_OF = 2
+RELATION_LEFT_OF = 3
+RELATION_SAME_AS = 4
+
+# some fundamental datatypes
+RRCrtc = c_long
+RROutput = c_long
+RRMode = c_long
+Connection = c_ushort
+SubpixelOrder = c_ushort
+Time = c_ulong
+Rotation = c_ushort
+Status = c_int
+
+# load the libs
+xlib = cdll.LoadLibrary('libX11.so.6')
+rr = cdll.LoadLibrary('libXrandr.so.2')
+
+
+# query resources
+class _XRRModeInfo(Structure):
+    _fields_ = [
+        ("id", RRMode),  # XID is c_long
+        ("width", c_int),
+        ("height", c_int),
+        ("dotClock", c_long),
+        ("hSyncStart", c_int),
+        ("hSyncEnd", c_int),
+        ("hTotal", c_int),
+        ("hSkew", c_int),
+        ("vSyncStart", c_int),
+        ("vSyncEnd", c_int),
+        ("vTotal", c_int),
+        ("name", c_char_p),
+        ("nameLength", c_int),
+        ("modeFlags", c_long),
+        ]
+
+
+class _XRRScreenSize(Structure):
+    _fields_ = [
+        ("width", c_int),
+        ("height", c_int),
+        ("mwidth", c_int),
+        ("mheight", c_int)
+        ]
+
+
+class _XRRCrtcInfo(Structure):
+    _fields_ = [
+        ("timestamp", Time),
+        ("x", c_int),
+        ("y", c_int),
+        ("width", c_int),
+        ("height", c_int),
+        ("mode", RRMode),
+        ("rotation", c_int),
+        ("noutput", c_int),
+        ("outputs", POINTER(RROutput)),
+        ("rotations", Rotation),
+        ("npossible", c_int),
+        ("possible", POINTER(RROutput)),
+        ]
+
+
+class _XRRScreenResources(Structure):
+    _fields_ = [
+        ("timestamp", Time),
+        ("configTimestamp", Time),
+        ("ncrtc", c_int),
+        ("crtcs", POINTER(RRCrtc)),
+        ("noutput", c_int),
+        ("outputs", POINTER(RROutput)),
+        ("nmode", c_int),
+        ("modes", POINTER(_XRRModeInfo)),
+        ]
+
+
+class RRError(Exception):
+    """Base exception class of the module"""
+    pass
+
+
+class UnsupportedRRError(RRError):
+    """Raised if the required XRandR extension version is not available"""
+    def __init__(self, required, current):
+        self.required = required
+        self.current = current
+
+
+# XRRGetOutputInfo
+class _XRROutputInfo(Structure):
+    _fields_ = [
+        ("timestamp", Time),
+        ("crtc", c_int),
+        ("name", c_char_p),
+        ("nameLen", c_int),
+        ("mm_width", c_ulong),
+        ("mm_height", c_ulong),
+        ("connection", Connection),
+        ("subpixel_order", SubpixelOrder),
+        ("ncrtc", c_int),
+        ("crtcs", POINTER(RRCrtc)),
+        ("nclone", c_int),
+        ("clones", POINTER(RROutput)),
+        ("nmode", c_int),
+        ("npreferred", c_int),
+        ("modes", POINTER(RRMode))
+        ]
+
+
+class _XRRCrtcGamma(Structure):
+    _fields_ = [
+        ('size', c_int),
+        ('red', POINTER(c_ushort)),
+        ('green', POINTER(c_ushort)),
+        ('blue', POINTER(c_ushort)),
+        ]
+
+
+def _array_conv(array, type, conv=lambda x: x):
+    length = len(array)
+    res = (type * length)()
+    for i in range(length):
+        res[i] = conv(array[i])
+    return res
+
+
+class Output:
+    """The output is a reference to a supported output jacket of the graphics
+       card. Outputs are attached to a hardware pipe to be used. Furthermore
+       they can be a clone of another output or show a subset of the screen"""
+    def __init__(self, info, id, screen):
+        """Initializes an output instance"""
+        self._info = info
+        self.id = id
+        self._screen = screen
+        # Store changes later here
+        self._mode = None
+        self._crtc = None
+        self._rotation = RR_ROTATE_0
+        self._relation = None
+        self._relation_offset = 0
+        self._relative_to = None
+        self._position = None
+        self._reflection = None
+        self._automatic = None
+        self._rate = None
+        self._changes = CHANGES_NONE
+        self._x = 0
+        self._y = 0
+
+        self.name = self._info.contents.name
+
+    def __del__(self):
+        """Frees the internal reference to the output info if the output gets
+           removed"""
+        rr.XRRFreeOutputInfo(self._info)
+
+    def get_physical_width(self):
+        """Returns the display width reported by the connected output device"""
+        return self._info.contents.mm_width
+
+    def get_physical_height(self):
+        """
+        Returns the display height reported by the connected output device
+        """
+        return self._info.contents.mm_height
+
+    def get_crtc(self):
+        """Returns the xid of the hardware pipe to which the output is
+           attached. If the output is disabled it will return 0"""
+        return self._info.contents.crtc
+
+    def get_crtcs(self):
+        """Returns the xids of the hardware pipes to which the output could
+           be attached"""
+        crtcs = []
+        for i in range(self._info.contents.ncrtc):
+            for crtc in self._screen.crtcs:
+                if crtc.xid == self._info.contents.crtcs[i]:
+                    crtcs.append(crtc)
+        return crtcs
+
+    def get_available_rotations(self):
+        """Returns a binary flag of the supported rotations of the output or
+           0 if the output is disabled"""
+        rotations = RR_ROTATE_0
+        found = False
+        if self.is_active():
+            # Get the rotations supported by all crtcs to make assigning
+            # crtcs easier. Furthermore there don't seem to be so many
+            # cards which show another behavior
+            for crtc in self.get_crtcs():
+                # Set rotations to the value of the first found crtc and
+                # then create a subset only for all other crtcs
+                if not found:
+                    rotations = crtc.get_available_rotations()
+                    found = True
+                else:
+                    rotations = rotations & crtc.get_available_rotations()
+        return rotations
+
+    def get_available_modes(self):
+        """Returns the list of supported mode lines (resolution, refresh rate)
+           that are supported by the connected device"""
+        modes = []
+        for m in range(self._info.contents.nmode):
+            output_modes = self._info.contents.modes
+            for s in range(self._screen._resources.contents.nmode):
+                screen_modes = self._screen._resources.contents.modes
+                if screen_modes[s].id == output_modes[m]:
+                    modes.append(screen_modes[s])
+        return modes
+
+    def get_preferred_mode(self):
+        """Returns an index that refers to the list of available modes and
+           points to the preferred mode of the connected device"""
+        return self._info.contents.npreferred
+
+    def is_active(self):
+        """Returns True if the output is attached to a hardware pipe, is
+           enabled"""
+        return self._info.contents.crtc != 0
+
+    def is_connected(self):
+        """Return True if a device is detected at the output"""
+        if self._info.contents.connection in (RR_CONNECTED,
+                                              RR_UNKOWN_CONNECTION):
+            return True
+        return False
+
+    def disable(self):
+        """Disables the output"""
+        if not self.is_active():
+            return
+        self._mode = None
+        self._crtc._outputs.remove(self)
+        self._crtc = None
+        self._changes = self._changes | CHANGES_CRTC | CHANGES_MODE
+
+    def set_to_mode(self, mode):
+        modes = self.get_available_modes()
+        if mode in range(len(modes)):
+            self._mode = modes[mode].id
+            return
+        raise RRError("Mode is not available")
+
+    def set_to_preferred_mode(self):
+        modes = self.get_available_modes()
+        mode = modes[self.get_preferred_mode()]
+        if mode != None:
+            self._mode = mode.id
+            return
+        raise RRError("Preferred mode is not available")
+
+    def get_clones(self):
+        """Returns the xids of the outputs which can be clones of the output"""
+        clones = []
+        for i in range(self._info.contents.nclone):
+            id = self._info.contents.clones[i]
+            o = self._screen.get_output_by_id(id)
+            clones.append(o)
+        return clones
+
+    def set_relation(self, relative, relation, offset=0):
+        """Sets the position of the output in relation to the given one"""
+        rel = self._screen.get_output_by_name(relative)
+        if rel and relation in (RELATION_LEFT_OF, RELATION_RIGHT_OF,
+                                RELATION_ABOVE, RELATION_BELOW,
+                                RELATION_SAME_AS):
+            self._relation = relation
+            self._relative_to = rel
+            self._relation_offset = offset
+            self._changes = self._changes | CHANGES_RELATION
+        else:
+            raise RRError("The given relative output or relation is not "
+                          "available")
+
+    def has_changed(self, changes=None):
+        """Checks if the output has changed: Either for a specific change or
+           generally"""
+        if changes:
+            return self._changes & changes
+        else:
+            return self._changes != CHANGES_NONE
+
+
+class Crtc:
+    """The crtc is a reference to a hardware pipe that is provided by the
+       graphics device. Outputs can be attached to crtcs"""
+
+    def __init__(self, info, xid, screen):
+        """Initializes the hardware pipe object"""
+        self._info = info
+        self.xid = xid
+        self._screen = screen
+        self._outputs = []
+
+    def __del__(self):
+        """Frees the reference to the rendering pipe if the instance gets
+           removed"""
+        rr.XRRFreeCrtcConfigInfo(self._info)
+
+    def get_xid(self):
+        """Returns the internal id of the crtc from the X server"""
+        return self.xid
+
+    def get_available_rotations(self):
+        """Returns a binary flag that contains the supported rotations of the
+           hardware pipe"""
+        return self._info.contents.rotations
+
+    def set_config(self, x, y, mode, outputs, rotation=RR_ROTATE_0):
+        """Configures the render pipe with the given mode and outputs. X and y
+           set the position of the crtc output in the screen"""
+        rr.XRRSetCrtcConfig(self._screen._display,
+                            self._screen._resources,
+                            self.xid,
+                            self._screen.get_timestamp(),
+                            c_int(x), c_int(y),
+                            mode,
+                            rotation,
+                            _array_conv(outputs, RROutput, lambda x: x.id),
+                            len(outputs))
+
+    def apply_changes(self):
+        """Applies the stored changes"""
+        if len(self._outputs) > 0:
+            output = self._outputs[0]
+            self.set_config(output._x, output._y, output._mode,
+                            self._outputs, output._rotation)
+        else:
+            self.disable()
+
+    def disable(self):
+        """Turns off all outputs on the crtc"""
+        rr.XRRSetCrtcConfig(self._screen._display,
+                            self._screen._resources,
+                            self.xid,
+                            self._screen.get_timestamp(),
+                            0, 0,
+                            None,
+                            RR_ROTATE_0,
+                            0, 0)
+
+    #FIXME: support gamma settings
+    """
+    def get_gamma_size(self):
+        return rr.XRRGetCrtcGammaSize(self._screen._display, self.id)
+    def get_gamma(self):
+        result = rr.XRRGetCrtcGamma(self._screen._display, self.id)
+        return _from_gamma(result)
+    def set_gamma(self, gamma):
+        g = _to_gamma(gamma)
+        rr.XRRSetCrtcGamma(self._screen._display, self.id, g)
+        rr.XRRFreeGamma(g)
+        gamma = property(get_gamma, set_gamma)"""
+
+    def load_outputs(self):
+        """Get the currently assigned outputs"""
+        outputs = []
+        for i in range(self._info.contents.noutput):
+            id = self._info.contents.outputs[i]
+            o = self._screen.get_output_by_id(id)
+            outputs.append(o)
+        self._outputs = outputs
+
+    def get_outputs(self):
+        """Returns the list of attached outputs"""
+        return self._outputs
+
+    def add_output(self, output):
+        """Adds the specified output to the crtc"""
+        output._crtc = self
+        self._outputs.append(output)
+
+    def supports_output(self, output):
+        """Check if the output can be used by the crtc.
+           See check_crtc_for_output in xrandr.c"""
+        if not self.xid in [c.xid for c in output.get_crtcs()]:
+            return False
+        if len(self._outputs):
+            for other in self._outputs:
+                if other == output:
+                    continue
+                if other._x != output._x:
+                    return False
+                if other._y != output._y:
+                    return False
+                if other._mode != output._mode:
+                    return False
+                if other._rotation != output._rotation:
+                    return False
+        #FIXME: pick_crtc is still missing
+        elif self._info.contents.noutput > 0:
+            if self._info.contents.x != output._x:
+                return False
+            if self._info.contents.y != output._y:
+                return False
+            if self._info.contents.mode_info != output._mode:
+                return False
+            if self._info.rotation != output._rotation:
+                return False
+        return True
+
+    def supports_rotation(self, rotation):
+        """Check if the given rotation is supported by the crtc"""
+        rotations = self._info.contents.rotations
+        dir = rotation & (RR_ROTATE_0 | RR_ROTATE_90 | RR_ROTATE_180 |
+                          RR_ROTATE_270)
+        reflect = rotation & (RR_REFLECT_X | RR_REFLECT_Y)
+        if (((rotations & dir) != 0) and ((rotations & reflect) == reflect)):
+            return True
+        return False
+
+    def has_changed(self):
+        """Check if there are any new outputs assigned to the crtc or any
+           outputs with a changed mode or position"""
+        if len(self._outputs) != self._info.contents.noutput:
+            return True
+        for i in range(self._info.contents.noutput):
+            id = self._info.contents.outputs[i]
+            output = self._screen.get_output_by_id(id)
+            if not output in self._outputs:
+                return True
+            if output.has_changed():
+                return True
+        return False
+
+
+class Screen:
+    def __init__(self, dpy, screen=-1):
+        """Initializes the screen"""
+        # Some sane default values
+        self.outputs = {}
+        self.crtcs = []
+        self._width = 0
+        self._height = 0
+        self._width_max = 0
+        self._height_max = 0
+        self._width_min = 0
+        self._height_min = 0
+        self._width_mm = 0
+        self._height_mm = 0
+
+        self._display = dpy
+        if not -1 <= screen < xlib.XScreenCount(dpy):
+            raise RRError("The chosen screen is not available", screen)
+        elif screen == -1:
+            self._screen = xlib.XDefaultScreen(dpy)
+        else:
+            self._screen = screen
+        self._root = xlib.XDefaultRootWindow(self._display, self._screen)
+        self._id = rr.XRRRootToScreen(self._display, self._root)
+
+        self._load_resources()
+        self._load_config()
+        (self._width, self._height,
+         self._width_mm, self._height_mm) = self.get_size()
+        if XRANDR_VERSION >= (1, 2):
+            self._load_screen_size_range()
+            self._load_crtcs()
+            self._load_outputs()
+
+        # Store XRandR 1.0 changes here
+        self._rate = self.get_current_rate()
+        self._rotation = self.get_current_rotation()
+        self._size_index = self.get_current_size_index()
+
+    def __del__(self):
+        """Free the reference to the interal screen config if the screen
+           gets removed"""
+        rr.XRRFreeScreenConfigInfo(self._config)
+
+    def _load_config(self):
+        """Loads the screen configuration. Only needed privately by the
+           the bindings"""
+        class XRRScreenConfiguration(Structure):
+            " private to Xrandr "
+            pass
+        gsi = rr.XRRGetScreenInfo
+        gsi.restype = POINTER(XRRScreenConfiguration)
+        self._config = gsi(self._display, self._root)
+
+    def _load_screen_size_range(self):
+        """Detects the dimensionios of the screen"""
+        minWidth = c_int()
+        minHeight = c_int()
+        maxWidth = c_int()
+        maxHeight = c_int()
+        res = rr.XRRGetScreenSizeRange(self._display, self._root,
+                                       byref(minWidth), byref(minHeight),
+                                       byref(maxWidth), byref(maxHeight))
+        if res:
+            self._width_max = maxWidth.value
+            self._width_min = minWidth.value
+            self._height_max = maxHeight.value
+            self._height_min = minHeight.value
+
+    def _load_resources(self):
+        """Loads the screen resources. Only needed privately for the
+           bindings"""
+        gsr = rr.XRRGetScreenResources
+        gsr.restype = POINTER(_XRRScreenResources)
+        self._resources = gsr(self._display, self._root)
+
+    def _load_crtcs(self):
+        """Loads the available XRandR 1.2 crtcs (hardware pipes) of
+           the screen"""
+        gci = rr.XRRGetCrtcInfo
+        gci.restype = POINTER(_XRRCrtcInfo)
+        c = self._resources.contents.crtcs
+        for i in range(self._resources.contents.ncrtc):
+            xrrcrtcinfo = gci(self._display, self._resources, c[i])
+            self.crtcs.append(Crtc(xrrcrtcinfo, c[i], self))
+
+    def _load_outputs(self):
+        """Loads the available XRandR 1.2 outputs of the screen"""
+        goi = rr.XRRGetOutputInfo
+        goi.restype = POINTER(_XRROutputInfo)
+        o = self._resources.contents.outputs
+        for i in range(self._resources.contents.noutput):
+            xrroutputinfo = goi(self._display, self._resources, o[i])
+            output = Output(xrroutputinfo, o[i], self)
+            self.outputs[xrroutputinfo.contents.name] = output
+            # Store the mode of the crtc in the output instance
+            crtc = self.get_crtc_by_xid(output.get_crtc())
+            if crtc:
+                output._mode = crtc._info.contents.mode
+                crtc.add_output(output)
+
+    def get_size(self):
+        """Returns the current pixel and physical size of the screen"""
+        width = xlib.XDisplayWidth(self._display, self._screen)
+        width_mm = xlib.XDisplayWidthMM(self._display, self._screen)
+        height = xlib.XDisplayHeight(self._display, self._screen)
+        height_mm = xlib.XDisplayHeightMM(self._display, self._screen)
+        return width, height, width_mm, height_mm
+
+    def get_timestamp(self):
+        """Creates a X timestamp that must be used when applying changes, since
+           they can be delayed"""
+        config_timestamp = Time()
+        rr.XRRTimes.restpye = c_ulong
+        return rr.XRRTimes(self._display, self._id, byref(config_timestamp))
+
+    def get_crtc_by_xid(self, xid):
+        """Returns the crtc with the given xid or None"""
+        for crtc in self.crtcs:
+            if crtc.xid == xid:
+                return crtc
+        return None
+
+    def get_current_rate(self):
+        """Returns the currently used refresh rate"""
+        _check_required_version((1, 0))
+        xccr = rr.XRRConfigCurrentRate
+        xccr.restype = c_int
+        return xccr(self._config)
+
+    def get_available_rates_for_size_index(self, size_index):
+        """Returns the refresh rates that are supported by the screen for
+           the given resolution. See get_available_sizes for the resolution to
+           which size_index points"""
+        _check_required_version((1, 0))
+        rates = []
+        nrates = c_int()
+        rr.XRRConfigRates.restype = POINTER(c_ushort)
+        _rates = rr.XRRConfigRates(self._config, size_index, byref(nrates))
+        for r in range(nrates.value):
+            rates.append(_rates[r])
+        return rates
+
+    def get_current_rotation(self):
+        """Returns the currently used rotation. Can be RR_ROTATE_0,
+        RR_ROTATE_90, RR_ROTATE_180 or RR_ROTATE_270"""
+        _check_required_version((1, 0))
+        current = c_ushort()
+        rr.XRRConfigRotations(self._config, byref(current))
+        return current.value
+
+    def get_available_rotations(self):
+        """Returns a binary flag that holds the available resolutions"""
+        _check_required_version((1, 0))
+        current = c_ushort()
+        rotations = rr.XRRConfigRotations(self._config, byref(current))
+        return rotations
+
+    def get_current_size_index(self):
+        """Returns the position of the currently used resolution size in the
+           list of available resolutions. See get_available_sizes"""
+        _check_required_version((1, 0))
+        rotation = c_ushort()
+        size = rr.XRRConfigCurrentConfiguration(self._config,
+                                                byref(rotation))
+        return size
+
+    def get_available_sizes(self):
+        """Returns the available resolution sizes of the screen. The size
+           index points to the corresponding resolution of this list"""
+        _check_required_version((1, 0))
+        sizes = []
+        nsizes = c_int()
+        xcs = rr.XRRConfigSizes
+        xcs.restype = POINTER(_XRRScreenSize)
+        _sizes = xcs(self._config, byref(nsizes))
+        for r in range(nsizes.value):
+            sizes.append(_sizes[r])
+        return sizes
+
+    def set_config(self, size_index, rate, rotation):
+        """Configures the screen with the given resolution at the given size
+           index, rotation and refresh rate. To get in effect call
+           Screen.apply_config()"""
+        _check_required_version((1, 0))
+        self.set_size_index(size_index)
+        self.set_refresh_rate(rate)
+        self.set_rotation(rotation)
+
+    def set_size_index(self, index):
+        """Sets the reoslution of the screen. To get in effect call
+           Screen.apply_config()"""
+        if index in range(len(self.get_available_sizes())):
+            self._size_index = index
+        else:
+            raise RRError("There isn't any size associated "
+                          "to the index %s" % index)
+
+    def set_rotation(self, rotation):
+        """Sets the rotation of the screen. To get in effect call
+           Screen.apply_config()"""
+        if self.get_available_rotations() & rotation:
+            self._rotation = rotation
+        else:
+            raise RRError("The chosen rotation is not supported")
+
+    def set_refresh_rate(self, rate):
+        """Sets the refresh rate of the screen. To get in effect call
+           Screen.apply_config()"""
+        if rate in self.get_available_rates_for_size_index(self._size_index):
+            self._rate = rate
+        else:
+            raise RRError("The chosen refresh rate %s is not "
+                          "supported" % rate)
+
+    def get_mode_by_xid(self, xid):
+        """Returns the mode of the given xid"""
+        screen_modes = self._resources.contents.modes
+        for s in range(self._resources.contents.nmode):
+            if screen_modes[s].id == xid:
+                return screen_modes[s]
+        return None
+
+    def get_output_by_name(self, name):
+        """Returns the output of the screen with the given name or None"""
+        if name in self.outputs:
+            return self.outputs[name]
+        else:
+            return None
+
+    def get_output_by_id(self, id):
+        """Returns the output of the screen with the given xid or None"""
+        for o in list(self.outputs.values()):
+            if o.id == id:
+                return o
+        return None
+
+    def print_info(self, verbose=False):
+        """Prints some information about the detected screen and its outputs"""
+        _check_required_version((1, 0))
+        print("Screen %s: minimum %s x %s, current %s x %s, maximum %s x %s" %\
+              (self._screen,
+               self._width_min, self._height_min,
+               self._width, self._height,
+               self._width_max, self._height_max))
+        print("          %smm x %smm" % (self._width_mm, self._height_mm))
+        print("Crtcs: %s" % len(self.crtcs))
+        if verbose:
+            print("Modes (%s):" % self._resources.contents.nmode)
+            modes = self._resources.contents.modes
+            for i in range(self._resources.contents.nmode):
+                print("  %s - %sx%s" % (modes[i].name,
+                                       modes[i].width,
+                                       modes[i].height))
+        i = 0
+        print("Sizes @ Refresh Rates:")
+        for s in self.get_available_sizes():
+            print("  [%s] %s x %s @ %s" % (
+                i, s.width, s.height,
+                self.get_available_rates_for_size_index(i)))
+            i += 1
+        print("Rotations:")
+        rots = self.get_available_rotations()
+        if rots & RR_ROTATE_0:
+            print("normal")
+        if rots & RR_ROTATE_90:
+            print("right")
+        if rots & RR_ROTATE_180:
+            print("inverted")
+        if rots & RR_ROTATE_270:
+            print("left")
+        print("")
+        print("Outputs:")
+        for o in list(self.outputs.keys()):
+            output = self.outputs[o]
+            print("  %s" % o)
+            if output.is_connected():
+                print("(%smm x %smm)" % (output.get_physical_width(),
+                                         output.get_physical_height()))
+                modes = output.get_available_modes()
+                print("    Modes:")
+                for m in range(len(modes)):
+                    mode = modes[m]
+                    refresh = mode.dotClock / (mode.hTotal * mode.vTotal)
+                    print("      [%s] %s x %s @ %s" % (m,
+                                                       mode.width,
+                                                       mode.height,
+                                                       refresh))
+                    if mode.id == output._mode:
+                        print("*")
+                    if m == output.get_preferred_mode():
+                        print("(preferred)")
+                    print("")
+                print("    Rotations:")
+                rots = output.get_available_rotations()
+                if rots & RR_ROTATE_0:
+                    print("normal")
+                if rots & RR_ROTATE_90:
+                    print("right")
+                if rots & RR_ROTATE_180:
+                    print("inverted")
+                if rots & RR_ROTATE_270:
+                    print("left")
+                print("")
+            else:
+                print("(not connected)")
+            if verbose:
+                print("    Core properties:")
+                for (f, t) in output._info.contents._fields_:
+                    print("      %s: %s" % (
+                        f, getattr(output._info.contents, f)))
+
+    def get_outputs(self):
+        """Returns the outputs of the screen"""
+        _check_required_version((1, 2))
+        return list(self.outputs.values())
+
+    def get_output_names(self):
+        _check_required_version((1, 2))
+        return list(self.outputs.keys())
+
+    def set_size(self, width, height, width_mm, height_mm):
+        """Apply the given pixel and physical size to the screen"""
+        _check_required_version((1, 2))
+        # Check if we really need to apply the changes
+        if (width, height, width_mm, height_mm) == self.get_size():
+            return
+        rr.XRRSetScreenSize(self._display, self._root,
+                            c_int(width), c_int(height),
+                            c_int(width_mm), c_int(height_mm))
+
+    def apply_output_config(self):
+        """Used for instantly applying RandR 1.2 changes"""
+        _check_required_version((1, 2))
+        self._arrange_outputs()
+        self._calculate_size()
+        self.set_size(self._width, self._height,
+                      self._width_mm, self._height_mm)
+
+        # Assign all active outputs to crtcs
+        for output in list(self.outputs.values()):
+            if not output._mode or output._crtc:
+                continue
+            for crtc in output.get_crtcs():
+                if crtc and crtc.supports_output(output):
+                    crtc.add_output(output)
+                    output._changes = output._changes | CHANGES_CRTC
+                    break
+            if not output._crtc:
+                #FIXME: Take a look at the pick_crtc code in xrandr.c
+                raise RRError("There is no matching crtc for the output")
+
+        # Apply stored changes of crtcs
+        for crtc in self.crtcs:
+            if crtc.has_changed():
+                crtc.apply_changes()
+
+    def apply_config(self):
+        """Used for instantly applying RandR 1.0 changes"""
+        _check_required_version((1, 0))
+        status = rr.XRRSetScreenConfigAndRate(self._display,
+                                              self._config,
+                                              self._root,
+                                              self._size_index,
+                                              self._rotation,
+                                              self._rate,
+                                              self.get_timestamp())
+        return status
+
+    def _arrange_outputs(self):
+        """Arrange all output positions according to their relative position"""
+        for output in self.get_outputs():
+            # Skip not changed and not used outputs
+            if not output.has_changed(CHANGES_RELATION) or \
+               output._mode == None:
+                continue
+            relative = output._relative_to
+            mode = self.get_mode_by_xid(output._mode)
+            mode_relative = self.get_mode_by_xid(relative._mode)
+            if not relative or not relative._mode:
+                output._x = 0
+                output._y = 0
+                output._changes = output._changes | CHANGES_POSITION
+            if output._relation == RELATION_LEFT_OF:
+                output._y = relative._y + output._relation_offset
+                output._x = relative._x - \
+                            get_mode_width(mode, output._rotation)
+            elif output._relation == RELATION_RIGHT_OF:
+                output._y = relative._y + output._relation_offset
+                output._x = relative._x + get_mode_width(mode_relative,
+                                                         output._rotation)
+            elif output._relation == RELATION_ABOVE:
+                output._y = relative._y - get_mode_height(mode,
+                                                          output._rotation)
+                output._x = relative._x + output._relation_offset
+            elif output._relation == RELATION_BELOW:
+                output._y = relative._y + get_mode_height(mode_relative,
+                                                          output._rotation)
+                output._x = relative._x + output._relation_offset
+            elif output._relation == RELATION_SAME_AS:
+                output._y = relative._y + output._relation_offset
+                output._x = relative._x + output._relation_offset
+            output._changes = output._changes | CHANGES_POSITION
+        # Normalize the postions so to the upper left cornor of all outputs
+        # is at 0,0
+        min_x = 32768
+        min_y = 32768
+        for output in self.get_outputs():
+            if output._mode == None:
+                continue
+            if output._x < min_x:
+                min_x = output._x
+            if output._y < min_y:
+                min_y = output._y
+        for output in self.get_outputs():
+            if output._mode == None:
+                continue
+            output._x -= min_x
+            output._y -= min_y
+            output._changes = output._changes | CHANGES_POSITION
+
+    def _calculate_size(self):
+        """Recalculate the pixel and physical size of the screen so that
+           it covers all outputs"""
+        width = self._width
+        height = self._height
+        for output in self.get_outputs():
+            if not output._mode:
+                continue
+            mode = self.get_mode_by_xid(output._mode)
+            x = output._x
+            y = output._y
+            w = get_mode_width(mode, output._rotation)
+            h = get_mode_height(mode, output._rotation)
+            if x + w > width:
+                width = x + w
+            if y + h > height:
+                height = y + h
+        if width > self._width_max or height > self._height_max:
+            raise RRError("The required size is not supported",
+                          (width, height), (self._width_max, self._width_min))
+        else:
+            if height < self._height_min:
+                self._fb_height = self._height_min
+            else:
+                self._height = height
+            if width < self._width_min:
+                self._width = self._width_min
+            else:
+                self._width = width
+        #FIXME: Physical size is missing
+
+
+def get_current_display():
+    """Returns the currently used display"""
+    display_url = os.getenv("DISPLAY")
+    open_display = xlib.XOpenDisplay
+    # Set .argtypes and .restype, to ensure proper
+    # type check and conversion
+    open_display.restype = c_void_p
+    open_display.argtypes = [c_char_p]
+    # XOpenDisplay accepts a char*, but
+    # display_url is a unicode string therefore
+    # we convert it to a bytes string
+    dpy = open_display(display_url.encode('utf-8'))
+    return dpy
+
+
+def get_current_screen():
+    """Returns the currently used screen"""
+    screen = Screen(get_current_display())
+    return screen
+
+
+def get_screen_of_display(display, count):
+    """Returns the screen of the given display"""
+    dpy = xlib.XOpenDisplay(display)
+    return Screen(dpy, count)
+
+
+def get_version():
+    """Returns a tuple containing the major and minor version of the xrandr
+       extension or None if the extension is not available"""
+    major = c_int()
+    minor = c_int()
+    res = rr.XRRQueryVersion(get_current_display(),
+                             byref(major), byref(minor))
+    if res:
+        return (major.value, minor.value)
+    return None
+
+
+def has_extension():
+    """Returns True if the xrandr extension is available"""
+    if XRANDR_VERSION:
+        return True
+    return False
+
+
+def _to_gamma(gamma):
+    g = rr.XRRAllocGamma(len(gamma[0]))
+    for i in range(gamma[0]):
+        g.red[i] = gamma[0][i]
+        g.green[i] = gamma[1][i]
+        g.blue[i] = gamma[2][i]
+    return g
+
+
+def _from_gamma(g):
+    gamma = ([], [], [])
+    for i in range(g.size):
+        gamma[0].append(g.red[i])
+        gamma[1].append(g.green[i])
+        gamma[2].append(g.blue[i])
+    rr.XRRFreeGamma(g)
+
+
+def _check_required_version(version):
+    """Raises an exception if the given or a later version of xrandr is not
+       available"""
+    if XRANDR_VERSION == None or XRANDR_VERSION < version:
+        raise UnsupportedRRError(version, XRANDR_VERSION)
+
+
+def get_mode_height(mode, rotation):
+    """Return the height of the given mode taking the rotation into account"""
+    if rotation & (RR_ROTATE_0 | RR_ROTATE_180):
+        return mode.height
+    elif rotation & (RR_ROTATE_90 | RR_ROTATE_270):
+        return mode.width
+    else:
+        return 0
+
+
+def get_mode_width(mode, rotation):
+    """Return the width of the given mode taking the rotation into account"""
+    if rotation & (RR_ROTATE_0 | RR_ROTATE_180):
+        return mode.width
+    elif rotation & (RR_ROTATE_90 | RR_ROTATE_270):
+        return mode.height
+    else:
+        return 0
+
+
+XRANDR_VERSION = get_version()
+
+# vim:ts=4:sw=4:et
 
=== added directory 'checkbox/dbus'
=== added file 'checkbox/dbus/__init__.py'
--- checkbox/dbus/__init__.py	1970-01-01 00:00:00 +0000
+++ checkbox/dbus/__init__.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,89 @@
+# This file is part of Checkbox.
+#
+# Copyright 2012 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+checkbox.dbus
+=============
+
+Utility modules for working with various things accessible over dbus
+"""
+
+import logging
+
+from dbus import SystemBus
+from dbus.mainloop.glib import DBusGMainLoop
+from dbus import (Array, Boolean, Byte, Dictionary, Double, Int16, Int32,
+                  Int64, ObjectPath, String, Struct, UInt16, UInt32, UInt64)
+from gi.repository import GObject
+
+
+def connect_to_system_bus():
+    """
+    Connect to the system bus properly.
+
+    Returns a tuple (system_bus, loop) where loop is a GObject.MainLoop
+    instance. The loop is there so that you can listen to signals.
+    """
+    # We'll need an event loop to observe signals. We will need the instance
+    # later below so let's keep it. Note that we're not passing it directly
+    # below as DBus needs specific API. The DBusGMainLoop class that we
+    # instantiate and pass is going to work with this instance transparently.
+    #
+    # NOTE: DBus tutorial suggests that we should create the loop _before_
+    # connecting to the bus.
+    logging.debug("Setting up glib-based event loop")
+    loop = GObject.MainLoop()
+    # Let's get the system bus object. We need that to access UDisks2 object
+    logging.debug("Connecting to DBus system bus")
+    system_bus = SystemBus(mainloop=DBusGMainLoop())
+    return system_bus, loop
+
+
+def drop_dbus_type(value):
+    """
+    Convert types from the DBus bindings to their python counterparts.
+
+    This function is mostly lossless, except for arrays of bytes (DBus
+    signature "y") that are transparently converted to strings, assuming
+    an UTF-8 encoded string.
+
+    The point of this function is to simplify printing of nested DBus data that
+    gets displayed in a rather illegible way.
+    """
+    if isinstance(value, Array) and value.signature == "y":
+        # Some other things are reported as array of bytes that are just
+        # strings but due to Unix heritage the encoding is not known.
+        # In practice it is better to treat them as UTF-8 strings
+        return bytes(value).decode("UTF-8", "replace").strip("\0")
+    elif isinstance(value, (Struct, Array)):
+        return [drop_dbus_type(item) for item in value]
+    elif isinstance(value, (Dictionary)):
+        return {drop_dbus_type(dict_key): drop_dbus_type(dict_value)
+                for dict_key, dict_value in value.items()}
+    elif isinstance(value, (String, ObjectPath)):
+        return str(value)
+    elif isinstance(value, (Byte, UInt16, UInt32, UInt64,
+                            Int16, Int32, Int64)):
+        return int(value)
+    elif isinstance(value, Boolean):
+        return bool(value)
+    elif isinstance(value, Double):
+        return float(value)
+    else:
+        return value
 
=== added file 'checkbox/dbus/udisks2.py'
--- checkbox/dbus/udisks2.py	1970-01-01 00:00:00 +0000
+++ checkbox/dbus/udisks2.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,479 @@
+# Copyright 2012 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3,
+# as published by the Free Software Foundation.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+checkbox.dbus.udisks2
+=====================
+
+Module for working with UDisks2 from python.
+
+There are two main classes that are interesting here.
+
+The first class is UDisksObserver, which is easy to setup and has pythonic API
+to all of the stuff that happens in UDisks2. It offers simple signal handlers
+for any changes that occur in UDisks2 that were advertised by DBus.
+
+The second class is UDisksModel, that builds on the observer class to offer
+persistent collection of objects managed by UDisks2.
+
+To work with this model you will likely want to look at:
+    http://udisks.freedesktop.org/docs/latest/ref-dbus.html
+"""
+
+import logging
+
+from dbus import Interface, PROPERTIES_IFACE
+from dbus.exceptions import DBusException
+
+from checkbox.dbus import drop_dbus_type
+
+__all__ = ['UDisks2Observer', 'UDisks2Model', 'Signal', 'is_udisks2_supported',
+           'lookup_udev_device']
+
+
+def is_udisks2_supported(system_bus):
+    """
+    Check if udisks2 is available on the system bus.
+
+    ..note::
+        Calling this _may_ trigger activation of the UDisks2 daemon but it
+        should only happen on systems where it is already expected to run all
+        the time.
+    """
+    observer = UDisks2Observer()
+    try:
+        logging.debug("Trying to connect to UDisks2...")
+        observer.connect_to_bus(system_bus)
+    except DBusException as exc:
+        if exc.get_dbus_name() == "org.freedesktop.DBus.Error.ServiceUnknown":
+            logging.debug("No UDisks2 on the system bus")
+            return False
+        else:
+            raise
+    else:
+        logging.debug("Got UDisks2 connection")
+        return True
+
+
+def map_udisks1_connection_bus(udisks1_connection_bus):
+    """
+    Map the value of udisks1 ConnectionBus property to the corresponding values
+    in udisks2. This a lossy function as some values are no longer supported.
+
+    Incorrect values raise LookupError
+    """
+    return {
+        'ata_serial_esata': '',  # gone from udisks2
+        'firewire': 'ieee1394',  # renamed
+        'scsi': '',              # gone from udisks2
+        'sdio': 'sdio',          # as-is
+        'usb': 'usb',            # as-is
+    }[udisks1_connection_bus]
+
+
+def lookup_udev_device(udisks2_object, udev_devices):
+    """
+    Find the udev_device that corresponds to the udisks2 object
+
+    Devices are matched by unix filesystem path of the special file (device).
+    The udisks2_object must implement the block device interface (so that the
+    block device path can be determined) or a ValueError is raised.
+
+    The udisks2_object must be the dictionary that maps from interface names to
+    dictionaries of properties. For compatible data see
+    UDisks2Model.managed_objects The udev_devices must be a list of udev
+    device, as returned from GUdev.
+
+    If there is no match, LookupError is raised with the unix block device
+    path.
+    """
+    try:
+        block_props = udisks2_object[UDISKS2_BLOCK_INTERFACE]
+    except KeyError:
+        raise ValueError("udisks2_object must be a block device")
+    else:
+        block_dev = block_props['Device']
+    for udev_device in udev_devices:
+        if udev_device.get_device_file() == block_dev:
+            return udev_device
+    raise LookupError(block_dev)
+
+
+# The well-known name for the ObjectManager interface, sadly it is not a part
+# of the python binding along with the rest of well-known names.
+OBJECT_MANAGER_INTERFACE = "org.freedesktop.DBus.ObjectManager"
+
+# The well-known name of the filesystem interface implemented by certain
+# objects exposed by UDisks2
+UDISKS2_FILESYSTEM_INTERFACE = "org.freedesktop.UDisks2.Filesystem"
+
+# The well-known name of the block (device) interface implemented by certain
+# objects exposed by UDisks2
+UDISKS2_BLOCK_INTERFACE = "org.freedesktop.UDisks2.Block"
+
+# The well-known name of the drive interface implemented by certain objects
+# exposed by UDisks2
+UDISKS2_DRIVE_INTERFACE = "org.freedesktop.UDisks2.Drive"
+
+
+class Signal:
+    """
+    Basic signal that supports arbitrary listeners.
+
+    While this class can be used directly it is best used with the helper
+    decorator Signal.define on a member function. The function body is ignored,
+    apart from the documentation.
+
+    The function name then becomes a unique (per encapsulating class instance)
+    object (an instance of this Signal class) that is created on demand.
+
+    In practice you just have a documentation and use
+    object.signal_name.connect() and object.signal_name(*args, **kwargs) to
+    fire it.
+    """
+
+    def __init__(self, signal_name):
+        """
+        Construct a signal with the given name
+        """
+        self._listeners = []
+        self._signal_name = signal_name
+
+    def connect(self, listener):
+        """
+        Connect a new listener to this signal
+
+        That listener will be called whenever fire() is invoked on the signal
+        """
+        self._listeners.append(listener)
+
+    def disconnect(self, listener):
+        """
+        Disconnect an existing listener from this signal
+        """
+        self._listeners.remove(listener)
+
+    def fire(self, args, kwargs):
+        """
+        Fire this signal with the specified arguments and keyword arguments.
+
+        Typically this is used by using __call__() on this object which is more
+        natural as it does all the argument packing/unpacking transparently.
+        """
+        for listener in self._listeners:
+            listener(*args, **kwargs)
+
+    def __call__(self, *args, **kwargs):
+        """
+        Call fire() with all arguments forwarded transparently
+        """
+        self.fire(args, kwargs)
+
+    @classmethod
+    def define(cls, dummy_func):
+        """
+        Helper decorator to define a signal descriptor in a class
+
+        The decorated function is never called but is used to get
+        documentation.
+        """
+        return _SignalDescriptor(dummy_func)
+
+
+class _SignalDescriptor:
+    """
+    Descriptor for convenient signal access.
+
+    Typically this class is used indirectly, when accessed from Signal.define
+    method decorator. It is used to do all the magic required when accessing
+    signal name on a class or instance.
+    """
+
+    def __init__(self, dummy_func):
+        self.signal_name = dummy_func.__name__
+        self.__doc__ = dummy_func.__doc__
+
+    def __repr__(self):
+        return "<SignalDecorator for signal: %r>" % self.signal_name
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+        # Ensure that the instance has __signals__ property
+        if not hasattr(instance, "__signals__"):
+            instance.__signals__ = {}
+        if self.signal_name not in instance.__signals__:
+            instance.__signals__[self.signal_name] = Signal(self.signal_name)
+        return instance.__signals__[self.signal_name]
+
+    def __set__(self, instance, value):
+        raise AttributeError("You cannot overwrite signals")
+
+    def __delete__(self, instance):
+        raise AttributeError("You cannot delete signals")
+
+
+class UDisks2Observer:
+    """
+    Class for observing ongoing changes in UDisks2
+    """
+
+    def __init__(self):
+        """
+        Create a UDisks2 model.
+
+        The model must be connected to a bus before it is first used, see
+        connect()
+        """
+        # Proxy to the UDisks2 object
+        self._udisks2_obj = None
+        # Proxy to the ObjectManager interface exposed by UDisks2 object
+        self._udisks2_obj_manager = None
+
+    @Signal.define
+    def on_initial_objects(self, managed_objects):
+        """
+        Signal fired when the initial list of objects becomes available
+        """
+
+    @Signal.define
+    def on_interfaces_added(self, object_path, interfaces_and_properties):
+        """
+        Signal fired when one or more interfaces gets added to a specific
+        object.
+        """
+
+    @Signal.define
+    def on_interfaces_removed(self, object_path, interfaces):
+        """
+        Signal fired when one or more interface gets removed from a specific
+        object
+        """
+
+    @Signal.define
+    def on_properties_changed(self, interface_name, changed_properties,
+                              invalidated_properties, sender=None):
+        """
+        Signal fired when one or more property changes value or becomes
+        invalidated.
+        """
+
+    def connect_to_bus(self, bus):
+        """
+        Establish initial connection to UDisks2 on the specified DBus bus.
+
+        This will also load the initial set of objects from UDisks2 and thus
+        fire the on_initial_objects() signal from the model. Please call this
+        method only after connecting that signal if you want to observe that
+        event.
+        """
+        # Once everything is ready connect to udisks2
+        self._connect_to_udisks2(bus)
+        # And read all the initial objects and setup
+        # change event handlers
+        self._get_initial_objects()
+
+    def _connect_to_udisks2(self, bus):
+        """
+        Setup the initial connection to UDisks2
+
+        This step can fail if UDisks2 is not available and cannot be
+        service-activated.
+        """
+        # Access the /org/freedesktop/UDisks2 object sitting on the
+        # org.freedesktop.UDisks2 bus name. This will trigger the necessary
+        # activation if udisksd is not running for any reason
+        logging.debug("Accessing main UDisks2 object")
+        self._udisks2_obj = bus.get_object(
+            "org.freedesktop.UDisks2", "/org/freedesktop/UDisks2")
+        # Now extract the standard ObjectManager interface so that we can
+        # observe and iterate the collection of objects that UDisks2 provides.
+        logging.debug("Accessing ObjectManager interface on UDisks2 object")
+        self._udisks2_obj_manager = Interface(
+            self._udisks2_obj, OBJECT_MANAGER_INTERFACE)
+        # Connect to the PropertiesChanged signal. Here unlike before we want
+        # to listen to all signals, regardless of who was sending them in the
+        # first place.
+        logging.debug("Setting up DBus signal handler for PropertiesChanged")
+        bus.add_signal_receiver(
+            self._on_properties_changed,
+            signal_name="PropertiesChanged",
+            dbus_interface=PROPERTIES_IFACE,
+            # Use the sender_keyword keyword argument to indicate that we wish
+            # to know the sender of each signal. For consistency with other
+            # signals we choose to use the 'object_path' keyword argument.
+            sender_keyword='sender')
+
+    def _get_initial_objects(self):
+        """
+        Get the initial collection of objects.
+
+        Needs to be called before the first signals from DBus are observed.
+        Requires a working connection to UDisks2.
+        """
+        # Having this interface we can now peek at the existing objects.
+        # We can use the standard method GetManagedObjects() to do that
+        logging.debug("Accessing GetManagedObjects() on UDisks2 object")
+        managed_objects = self._udisks2_obj_manager.GetManagedObjects()
+        managed_objects = drop_dbus_type(managed_objects)
+        # Fire the public signal for getting initial objects
+        self.on_initial_objects(managed_objects)
+        # Connect our internal handles to the DBus signal handlers
+        logging.debug("Setting up DBus signal handler for InterfacesAdded")
+        self._udisks2_obj_manager.connect_to_signal(
+            "InterfacesAdded", self._on_interfaces_added)
+        logging.debug("Setting up DBus signal handler for InterfacesRemoved")
+        self._udisks2_obj_manager.connect_to_signal(
+            "InterfacesRemoved", self._on_interfaces_removed)
+
+    def _on_interfaces_added(self, object_path, interfaces_and_properties):
+        """
+        Internal callback that is called by DBus
+
+        This function is responsible for firing the public signal
+        """
+        # Convert from dbus types
+        object_path = drop_dbus_type(object_path)
+        interfaces_and_properties = drop_dbus_type(interfaces_and_properties)
+        # Log what's going on
+        logging.debug("The object %r has gained the following interfaces and "
+                      "properties: %r", object_path, interfaces_and_properties)
+        # Call the signal handler
+        self.on_interfaces_added(object_path, interfaces_and_properties)
+
+    def _on_interfaces_removed(self, object_path, interfaces):
+        """
+        Internal callback that is called by DBus
+
+        This function is responsible for firing the public signal
+        """
+        # Convert from dbus types
+        object_path = drop_dbus_type(object_path)
+        interfaces = drop_dbus_type(interfaces)
+        # Log what's going on
+        logging.debug("The object %r has lost the following interfaces: %r",
+                      object_path, interfaces)
+        # Call the signal handler
+        self.on_interfaces_removed(object_path, interfaces)
+
+    def _on_properties_changed(self, interface_name, changed_properties,
+                               invalidated_properties, sender=None):
+        """
+        Internal callback that is called by DBus
+
+        This function is responsible for firing the public signal
+        """
+        # Convert from dbus types
+        interface_name = drop_dbus_type(interface_name)
+        changed_properties = drop_dbus_type(changed_properties)
+        invalidated_properties = drop_dbus_type(invalidated_properties)
+        sender = drop_dbus_type(sender)
+        # Log what's going on
+        logging.debug("Some object with the interface %r has changed "
+                      "properties: %r and invalidated properties %r "
+                      "(sender: %s)",
+                      interface_name, changed_properties,
+                      invalidated_properties, sender)
+        # Call the signal handler
+        self.on_properties_changed(interface_name, changed_properties,
+                                   invalidated_properties, sender)
+
+
+class UDisks2Model:
+    """
+    Model for working with UDisks2
+
+    This class maintains a persistent model of what UDisks2 knows about, based
+    on the UDisks2Observer class and the signals it offers.
+    """
+
+    def __init__(self, observer):
+        """
+        Create a UDisks2 model.
+
+        The model will track changes using the specified observer (which is
+        expected to be a UDisks2Observer instance)
+
+        You should only connect the observer to the bus after creating the
+        model otherwise the initial objects will not be detected.
+        """
+        # Local state, everything that UDisks2 tells us
+        self._managed_objects = {}
+        self._observer = observer
+        # Connect all the signals to the observer
+        self._observer.on_initial_objects.connect(self._on_initial_objects)
+        self._observer.on_interfaces_added.connect(self._on_interfaces_added)
+        self._observer.on_interfaces_removed.connect(
+            self._on_interfaces_removed)
+        self._observer.on_properties_changed.connect(
+            self._on_properties_changed)
+
+    @Signal.define
+    def on_change(self):
+        """
+        Signal sent whenever the collection of managed object changes
+
+        Note that this signal is fired _after_ the change has occurred
+        """
+
+    @property
+    def managed_objects(self):
+        """
+        A collection of objects that is managed by this model. All changes as
+        well as the initial state, are reflected here.
+        """
+        return self._managed_objects
+
+    def _on_initial_objects(self, managed_objects):
+        """
+        Internal callback called when we get the initial collection of objects
+        """
+        self._managed_objects = drop_dbus_type(managed_objects)
+
+    def _on_interfaces_added(self, object_path, interfaces_and_properties):
+        """
+        Internal callback called when an interface is added to certain object
+        """
+        # Update internal state
+        if object_path not in self._managed_objects:
+            self._managed_objects[object_path] = {}
+        obj = self._managed_objects[object_path]
+        obj.update(interfaces_and_properties)
+        # Fire the change signal
+        self.on_change()
+
+    def _on_interfaces_removed(self, object_path, interfaces):
+        """
+        Internal callback called when an interface is removed from a certain
+        object
+        """
+        # Update internal state
+        if object_path in self._managed_objects:
+            obj = self._managed_objects[object_path]
+            for interface in interfaces:
+                if interface in obj:
+                    del obj[interface]
+        # Fire the change signal
+        self.on_change()
+
+    def _on_properties_changed(self, interface_name, changed_properties,
+                               invalidated_properties, sender=None):
+        # XXX: This is a workaround the fact that we cannot
+        # properly track changes to all properties :-(
+        self._managed_objects = drop_dbus_type(
+            self._observer._udisks2_obj_manager.GetManagedObjects())
+        # Fire the change signal()
+        self.on_change()
 
=== added file 'checkbox/dispatcher.py'
--- checkbox/dispatcher.py	1970-01-01 00:00:00 +0000
+++ checkbox/dispatcher.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,216 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2010-12 Canonical Ltd.
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+#
+__metaclass__ = type
+
+__all__ = [
+    "Dispatcher",
+    "DispatcherList",
+    "DispatcherQueue",
+    ]
+
+import logging
+
+from itertools import product
+
+
+class Event:
+    """Event payload containing the positional and keywoard arguments
+    passed to the handler in the event listener."""
+
+    def __init__(self, type, *args, **kwargs):
+        self.type = type
+        self.args = args
+        self.kwargs = kwargs
+
+
+class Listener:
+    """Event listener notified when events are published by the dispatcher."""
+
+    def __init__(self, event_type, handler, count):
+        self.event_type = event_type
+        self.handler = handler
+        self.count = count
+
+    def notify(self, event):
+        """Notify the handler with the payload of the event.
+
+        :param event: The event containint the payload for the handler.
+        """
+        if self.count is None or self.count:
+            self.handler(*event.args, **event.kwargs)
+            if self.count:
+                self.count -= 1
+
+
+class ListenerList(Listener):
+    """Event listener notified for lists of events."""
+
+    def __init__(self, *args, **kwargs):
+        super(ListenerList, self).__init__(*args, **kwargs)
+        self.event_types = set(self.event_type)
+        self.kwargs = {}
+
+    def notify(self, event):
+        """Only notify the handler when all the events for this listener
+        have been published by the dispatcher. When duplicate events
+        occur, the latest event is preserved and the previous one are
+        overwritten until all events have been published.
+        """
+        if self.count is None or self.count:
+            self.kwargs[event.type] = event.args[0]
+            if self.event_types.issubset(self.kwargs):
+                self.handler(**self.kwargs)
+                if self.count:
+                    self.count -= 1
+
+
+class ListenerQueue(ListenerList):
+
+    def notify(self, event):
+        """Only notify the handler when all the events for this listener
+        have been published by the dispatcher. Duplicate events are enqueued
+        and dequeued only when all events have been published.
+        """
+        arg = event.args[0]
+        queue = self.kwargs.setdefault(event.type, [])
+
+        # Strip duplicates from the queue.
+        if arg not in queue:
+            queue.append(arg)
+
+        # Once the queue has handler has been called, the queue
+        # then behaves like a list using the latest events.
+        if self.event_types.issubset(self.kwargs):
+            self.notify = notify = super(ListenerQueue, self).notify
+            keys = list(self.kwargs.keys())
+            for values in product(*list(self.kwargs.values())):
+                self.kwargs = dict(list(zip(keys, values)))
+                notify(event)
+
+
+class Dispatcher:
+    """Register handlers and publish events for them identified by strings."""
+
+    listener_factory = Listener
+
+    def __init__(self, listener_factory=None):
+        self._event_listeners = {}
+
+        if listener_factory is not None:
+            self.listener_factory = listener_factory
+
+    def registerHandler(self, event_type, handler, count=None):
+        """Register an event handler and return its listener.
+
+        :param event_type: The name of the event type to handle.
+        :param handler: The function handling the given event type.
+        :param count: Optionally, the number times to call the handler.
+        """
+        listener = self.listener_factory(event_type, handler, count)
+
+        listeners = self._event_listeners.setdefault(event_type, [])
+        listeners.append(listener)
+
+        return listener
+
+    def unregisterHandler(self, handler):
+        """Unregister a handler.
+
+        :param handler: The handler to unregister.
+        """
+        for event_type, listeners in self._event_listeners.items():
+            listeners = [
+                listener for listener in listeners
+                if listener.handler == handler]
+            if listeners:
+                self._event_listeners[event_type] = listeners
+            else:
+                del self._event_listeners[event_type]
+
+    def unregisterListener(self, listener, event_type=None):
+        """Unregister a listener.
+
+        :param listener: The listener of the handler to unregister.
+        :param event_type: Optionally, the event_type to unregister.
+        """
+        if event_type is None:
+            event_type = listener.event_type
+
+        self._event_listeners[event_type].remove(listener)
+        if not self._event_listeners[event_type]:
+            del self._event_listeners[event_type]
+
+    def publishEvent(self, event_type, *args, **kwargs):
+        """Publish an event of a given type and notify all listeners.
+
+        :param event_type: The name of the event type to publish.
+        :param args: Positional arguments to pass to the registered handlers.
+        :param kwargs: Keyword arguments to pass to the registered handlers.
+        """
+        if event_type in self._event_listeners:
+            event = Event(event_type, *args, **kwargs)
+            for listener in list(self._event_listeners[event_type]):
+                try:
+                    listener.notify(event)
+                    if listener.count is not None and not listener.count:
+                        self.unregisterListener(listener)
+                except:
+                    logging.exception(
+                        "Error running event handler for %r with args %r %r",
+                        event_type, args, kwargs)
+
+
+class DispatcherList(Dispatcher):
+    """
+    Register handlers and publish events for them identified by lists
+    of strings.
+    """
+
+    listener_factory = ListenerList
+
+    def registerHandler(self, event_types, handler, count=None):
+        """See Dispatcher."""
+        if not isinstance(event_types, (list, tuple)):
+            event_types = (event_types,)
+
+        listener = self.listener_factory(event_types, handler, count)
+        for event_type in event_types:
+            listeners = self._event_listeners.setdefault(event_type, [])
+            listeners.append(listener)
+
+        return listener
+
+    def unregisterListener(self, listener):
+        """See Dispatcher."""
+        for event_type in listener.event_types:
+            super(DispatcherList, self).unregisterListener(
+                listener, event_type)
+
+    def publishEvent(self, event_type, arg):
+        """See Dispatcher."""
+        super(DispatcherList, self).publishEvent(event_type, arg)
+
+
+class DispatcherQueue(DispatcherList):
+    """
+    Register handlers and publish events for them identified by lists
+    of strings in queue order.
+    """
+
+    listener_factory = ListenerQueue
 
=== added directory 'checkbox/heuristics'
=== added file 'checkbox/heuristics/__init__.py'
--- checkbox/heuristics/__init__.py	1970-01-01 00:00:00 +0000
+++ checkbox/heuristics/__init__.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,56 @@
+# This file is part of Checkbox.
+#
+# Copyright 2012 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+checkbox.heuristics
+===================
+
+This module contains implementations behind various heuristics used throughout
+the code. The intent of this module is twofold:
+
+    1) To encourage code reuse so that developers can use one implementation of
+       "guesswork" that is sometimes needed in our test. This reduces duplicate
+       bugs where many scripts do similar things in a different way.
+
+    2) To identify missing features in plumbing layer APIs such as
+       udev/udisks/dbus etc. Ideally no program should have to guess this, the
+       plumbing layer should be able to provide this meta data to allow
+       application developers deliver consistent behavior across userspace.
+
+Heuristics should be reusable from both python and shell. To make that possible
+each heuristics needs to be constrained to serializable input and output. This
+levels the playing field and allows both shell developers and python developers
+to reuse the same function.
+
+Additionally heuristics should try to avoid accessing thick APIs (such as
+objects returned by various libraries. This is meant to decrease the likelihood
+that updates to those libraries break this code. As an added side effect this
+also should make the implementation more explicit and easier to understand.
+
+In the long term each heuristic should be discussed with upstream developers of
+the particular problem area (udev, udisks, etc) to see if that subsystem can
+provide the required information directly, without us having to guess and fill
+the gaps.
+
+Things to consider when adding entries to this package:
+
+    1) File a bug on the upstream package about missing feature.
+
+    2) File a bug on checkbox to de-duplicate similar heuristics
+"""
 
=== added directory 'checkbox/heuristics/tests'
=== added file 'checkbox/heuristics/tests/__init__.py'
=== added file 'checkbox/heuristics/tests/test_udisks2.py'
--- checkbox/heuristics/tests/test_udisks2.py	1970-01-01 00:00:00 +0000
+++ checkbox/heuristics/tests/test_udisks2.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,40 @@
+# This file is part of Checkbox.
+#
+# Copyright 2012 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+
+checkbox.heuristics.tests.test_udisks2
+======================================
+
+Unit tests for checkbox.heuristics.udisks2 module
+"""
+
+from unittest import TestCase
+
+from checkbox.heuristics.udisks2 import is_memory_card
+
+
+class TestIsMemoryCard(TestCase):
+
+    def test_generic(self):
+        """
+        Device with vendor string "GENERIC" is a memory card
+        """
+        self.assertTrue(
+            is_memory_card(vendor="Generic", model="", udisks2_media=None))
 
=== added file 'checkbox/heuristics/udev.py'
--- checkbox/heuristics/udev.py	1970-01-01 00:00:00 +0000
+++ checkbox/heuristics/udev.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,44 @@
+# This file is part of Checkbox.
+#
+# Copyright 2012 Canonical Ltd.
+# Written by:
+#   Zygmunt Krynicki <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Checkbox 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+checkbox.heuristics.dev
+=======================
+
+Heuristics for udev.
+
+    Documentation: http://udisks.freedesktop.org/docs/latest/
+    Source code: http://cgit.freedesktop.org/systemd/systemd/ (src/udev)
+    Bug tracker: http://bugs.freedesktop.org/ (using systemd product)
+"""
+
+
+def is_virtual_device(device_file):
+    """
+    Given a device name like /dev/ramX, /dev/sdX or /dev/loopX determine if
+    this is a virtual device. Virtual devices are typically uninteresting to
+    users. The only exception may be nonempty loopback device.
+
+    Possible prior art: gnome-disks, palimpset (precursor, suffering from this
+    flaw and showing all the /dev/ram devices by default)
+    """
+    for part in device_file.split("/"):
+        if part.startswith("ram") or part.startswith("loop"):
+            return True
+    return False
 
=== added file 'checkbox/heuristics/udisks2.py'
--- checkbox/heuristics/udisks2.py	1970-01-01 00:00:00 +0000
+++ checkbox/heuristics/udisks2.py	2013-10-01 18:38:21 +0000
@@ -0,0 +1,62 @@