Merge lp:~smoser/simplestreams/trunk.moved-to-git into lp:simplestreams

[Scott Moser]

Development has been moved to git.

Simplestreams has moved its development from bzr to git.

If you are seeing this message, it means you have checked out via bzr.
Please update your workflow to use git. Instead of
  bzr branch lp:simplestreams
use:
  git clone https://git.launchpad.net/simplestreams

*************** DO NOT LAND BEFORE 2018-08-21 *******************
We currently have a warning being printed in the bzr source code that
mentions it will stay useful until 2018-07-31.

So do not merge this until after 2018-08-21.
Reality is that no one will see the warning, but will hopefully
see the failure. They can respond to the failure by
 a.) immediately putting 'SIMPLESTREAMS_BZR=1' into environment
 b.) moving to git as directed.

After 3 weeks of that, then we will pull the plug entirely.

[lp:~smoser/simplestreams/trunk.moved-to-git]

463. By Scott Moser on 2018-06-27

Leave module in place and raise exception.

This way the 'import simplestreams' will show the message to
any user that uses it, rather than having them have to figure
it out by noticing an empty directory and reading a README.txt.

464. By Scott Moser on 2018-06-27

remove the date and raise RuntimeError

[Corey Bryant (corey.bryant)]

I ran this by the team today and we're +1 on it. The glance-symplestreams-sync charm installs from the python-simplestreams package which I don't foresee this will have any affect on.

[Corey Bryant (corey.bryant)]

review: Approve

[David Ames (thedac)]

Yay, git!

review: Approve

=== removed file 'LICENSE'
--- LICENSE	2013-03-26 01:24:58 +0000
+++ LICENSE	1970-01-01 00:00:00 +0000
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are 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.
-
-  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.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  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 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 work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  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 AGPL, see
-<http://www.gnu.org/licenses/>.

=== removed file 'Makefile'
--- Makefile	2018-06-25 18:03:13 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-TENV := ./tools/tenv
-
-EXDATA_SIGN ?= 1
-ifeq ($(EXDATA_SIGN),1)
-    EXDATA_SIGN_ARG := --sign
-endif
-
-build:
-	@echo nothing to do for $@
-
-test: test2 test3 flake8
-
-test3: examples-sign
-	SIMPLESTREAMS_BZR=1 $(TENV) nosetests3 -v tests/
-test2: examples-sign
-	SIMPLESTREAMS_BZR=1 $(TENV) nosetests -v tests/
-
-flake8:
-	# any means run via 'flake8' or 'python3 -m flake8'
-	./tools/run-flake8 any
-
-exdata: exdata/fake exdata/data
-
-exdata/data: exdata-query gnupg
-	$(TENV) env REAL_DATA=1 ./tools/make-test-data $(EXDATA_SIGN_ARG) exdata-query/ exdata/data
-
-exdata/fake: exdata-query gnupg
-	$(TENV) ./tools/make-test-data $(EXDATA_SIGN_ARG) exdata-query/ exdata/fake
-
-exdata-query:
-	rsync -avz --delete --exclude "FILE_DATA_CACHE" --exclude ".bzr/*" cloud-images.ubuntu.com::uec-images/query/ exdata-query
-
-gnupg: gnupg/README
-
-gnupg/README:
-	./tools/create-gpgdir
-
-examples-sign: gnupg/README
-	$(TENV) ./tools/sign-examples
-
-.PHONY: exdata/fake exdata/data exdata-query examples-sign flake8 test test2 test3

=== modified file 'README.txt'
--- README.txt	2018-06-25 18:03:13 +0000
+++ README.txt	2018-06-27 19:28:50 +0000
@@ -7,5 +7,5 @@
 ** use:                                                                   **
 **   git clone https://git.launchpad.net/simplestreams                    **
 **                                                                        **
-** This bzr repository is expected to be removed by 2018-07-31            **
+** This bzr repository is no longer functional.                           **
 ****************************************************************************

=== removed directory 'bin'
=== removed file 'bin/json2streams'
--- bin/json2streams	2015-11-04 17:17:43 +0000
+++ bin/json2streams	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/usr/bin/env python3
-#   Copyright (C) 2013, 2015 Canonical Ltd.
-
-import sys
-from simplestreams.json2streams import main
-
-
-if __name__ == '__main__':
-    sys.exit(main())

=== removed file 'bin/sstream-mirror'
--- bin/sstream-mirror	2015-10-29 18:21:50 +0000
+++ bin/sstream-mirror	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-#!/usr/bin/python3
-#   Copyright (C) 2013 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
-import argparse
-import sys
-
-from simplestreams import filters
-from simplestreams import log
-from simplestreams import mirrors
-from simplestreams import objectstores
-from simplestreams import util
-
-
-class DotProgress(object):
-    def __init__(self, expected=None, columns=80):
-        self.curpath = None
-        self.printed = None
-        self.expected = expected
-        self.bytes_read = 0
-        self.columns = columns
-
-    def write_progress(self, path, cur, total):
-        if self.curpath != path:
-            self.printed = 0
-            self.curpath = path
-            status = ""
-            if self.expected:
-                status = (" %02s%%" %
-                          (int(self.bytes_read * 100 / self.expected)))
-            sys.stderr.write('=> %s [%s]%s\n' % (path, total, status))
-
-        if cur == total:
-            sys.stderr.write("\n")
-            if self.expected:
-                self.bytes_read += total
-            return
-
-        toprint = int(cur * self.columns / total) - self.printed
-        if toprint <= 0:
-            return
-        sys.stderr.write('.' * toprint)
-        sys.stderr.flush()
-        self.printed += toprint
-
-
-def main():
-    parser = argparse.ArgumentParser()
-
-    parser.add_argument('--keep', action='store_true', default=False,
-                        help='keep items in target up to MAX items '
-                             'even after they have fallen out of the source')
-    parser.add_argument('--max', type=int, default=None,
-                        help='store at most MAX items in the target')
-    parser.add_argument('--path', default=None,
-                        help='sync from index or products file in mirror')
-    parser.add_argument('--no-item-download', action='store_true',
-                        default=False,
-                        help='do not download items with a "path"')
-    parser.add_argument('--dry-run', action='store_true', default=False,
-                        help='only report what would be done')
-    parser.add_argument('--progress', action='store_true', default=False,
-                        help='show progress for downloading files')
-    parser.add_argument('--mirror', action='append', default=[],
-                        dest="mirrors",
-                        help='additional mirrors to find referenced files')
-
-    parser.add_argument('--verbose', '-v', action='count', default=0)
-    parser.add_argument('--log-file', default=sys.stderr,
-                        type=argparse.FileType('w'))
-
-    parser.add_argument('--keyring', action='store', default=None,
-                        help='keyring to be specified to gpg via --keyring')
-    parser.add_argument('--no-verify', '-U', action='store_false',
-                        dest='verify', default=True,
-                        help="do not gpg check signed json files")
-    parser.add_argument('--no-checksumming-reader', action='store_false',
-                        dest='checksumming_reader', default=True,
-                        help=("do not call 'insert_item' with a reader"
-                              " that does checksumming."))
-
-    parser.add_argument('source_mirror')
-    parser.add_argument('output_d')
-    parser.add_argument('filters', nargs='*', default=[])
-
-    args = parser.parse_args()
-
-    (mirror_url, initial_path) = util.path_from_mirror_url(args.source_mirror,
-                                                           args.path)
-
-    def policy(content, path):
-        if initial_path.endswith('sjson'):
-            return util.read_signed(content,
-                                    keyring=args.keyring,
-                                    checked=args.verify)
-        else:
-            return content
-
-    filter_list = filters.get_filters(args.filters)
-    mirror_config = {'max_items': args.max, 'keep_items': args.keep,
-                     'filters': filter_list,
-                     'item_download': not args.no_item_download,
-                     'checksumming_reader': args.checksumming_reader}
-
-    level = (log.ERROR, log.INFO, log.DEBUG)[min(args.verbose, 2)]
-    log.basicConfig(stream=args.log_file, level=level)
-
-    smirror = mirrors.UrlMirrorReader(mirror_url, mirrors=args.mirrors,
-                                      policy=policy)
-    tstore = objectstores.FileStore(args.output_d)
-
-    drmirror = mirrors.DryRunMirrorWriter(config=mirror_config,
-                                          objectstore=tstore)
-    drmirror.sync(smirror, initial_path)
-
-    def print_diff(char, items):
-        for pedigree, path, size in items:
-            fmt = "{char} {pedigree} {path} {size} Mb\n"
-            size = int(size / (1024 * 1024))
-            sys.stderr.write(fmt.format(
-                char=char, pedigree=' '.join(pedigree), path=path, size=size))
-
-    print_diff('+', drmirror.downloading)
-    print_diff('-', drmirror.removing)
-    sys.stderr.write("%d Mb change\n" % (drmirror.size / (1024 * 1024)))
-
-    if args.dry_run:
-        return True
-
-    if args.progress:
-        callback = DotProgress(expected=drmirror.size).write_progress
-    else:
-        callback = None
-
-    tstore = objectstores.FileStore(args.output_d, complete_callback=callback)
-
-    tmirror = mirrors.ObjectFilterMirror(config=mirror_config,
-                                         objectstore=tstore)
-
-    tmirror.sync(smirror, initial_path)
-
-
-if __name__ == '__main__':
-    main()
-
-# vi: ts=4 expandtab syntax=python

=== removed file 'bin/sstream-query'
--- bin/sstream-query	2016-11-28 14:54:35 +0000
+++ bin/sstream-query	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-#!/usr/bin/python3
-#   Copyright (C) 2013 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
-
-from simplestreams import filters
-from simplestreams import mirrors
-from simplestreams import log
-from simplestreams import util
-
-import argparse
-import errno
-import json
-import pprint
-import signal
-import sys
-
-FORMAT_PRETTY = "PRETTY"
-FORMAT_JSON = "JSON"
-
-
-def warn(msg):
-    sys.stderr.write("WARN: %s" % msg)
-
-
-class FilterMirror(mirrors.BasicMirrorWriter):
-    def __init__(self, config=None):
-        super(FilterMirror, self).__init__(config=config)
-        if config is None:
-            config = {}
-        self.config = config
-        self.filters = config.get('filters', [])
-        outfmt = config.get('output_format')
-        if not outfmt:
-            outfmt = "%s"
-        self.output_format = outfmt
-        self.json_entries = []
-
-    def load_products(self, path=None, content_id=None):
-        return {'content_id': content_id, 'products': {}}
-
-    def filter_item(self, data, src, target, pedigree):
-        return filters.filter_item(self.filters, data, src, pedigree)
-
-    def insert_item(self, data, src, target, pedigree, contentsource):
-        # src and target are top level products:1.0
-        # data is src['products'][ped[0]]['versions'][ped[1]]['items'][ped[2]]
-        # contentsource is a ContentSource if 'path' exists in data or None
-        data = util.products_exdata(src, pedigree)
-        if 'path' in data:
-            data.update({'item_url': contentsource.url})
-
-        if self.output_format == FORMAT_PRETTY:
-            pprint.pprint(data)
-        elif self.output_format == FORMAT_JSON:
-            self.json_entries.append(data)
-        else:
-            try:
-                print(self.output_format % (data))
-            except KeyError as e:
-                sys.stderr.write("output format failed. Missing %s\n" % e.args)
-                sys.stderr.write("item: %s\n" % data)
-
-
-def main():
-    parser = argparse.ArgumentParser()
-
-    parser.add_argument('--max', type=int, default=None, dest='max_items',
-                        help='store at most MAX items in the target')
-
-    parser.add_argument('--path', default=None,
-                        help='sync from index or products file in mirror')
-
-    fmt_group = parser.add_mutually_exclusive_group()
-    fmt_group.add_argument('--output-format', '-o', action='store',
-                           dest='output_format', default=None,
-                           help="specify output format per python str.format")
-    fmt_group.add_argument('--pretty', action='store_const',
-                           const=FORMAT_PRETTY, dest='output_format',
-                           help="pretty print output")
-    fmt_group.add_argument('--json', action='store_const',
-                           const=FORMAT_JSON, dest='output_format',
-                           help="output in JSON as a list of dicts.")
-    parser.add_argument('--verbose', '-v', action='count', default=0)
-    parser.add_argument('--log-file', default=sys.stderr,
-                        type=argparse.FileType('w'))
-
-    parser.add_argument('--keyring', action='store', default=None,
-                        help='keyring to be specified to gpg via --keyring')
-    parser.add_argument('--no-verify', '-U', action='store_false',
-                        dest='verify', default=True,
-                        help="do not gpg check signed json files")
-
-    parser.add_argument('mirror_url')
-    parser.add_argument('filters', nargs='*', default=[])
-
-    cmdargs = parser.parse_args()
-
-    (mirror_url, path) = util.path_from_mirror_url(cmdargs.mirror_url,
-                                                   cmdargs.path)
-
-    level = (log.ERROR, log.INFO, log.DEBUG)[min(cmdargs.verbose, 2)]
-    log.basicConfig(stream=cmdargs.log_file, level=level)
-
-    initial_path = path
-
-    def policy(content, path):
-        if initial_path.endswith('sjson'):
-            return util.read_signed(content,
-                                    keyring=cmdargs.keyring,
-                                    checked=cmdargs.verify)
-        else:
-            return content
-
-    smirror = mirrors.UrlMirrorReader(mirror_url, policy=policy)
-
-    filter_list = filters.get_filters(cmdargs.filters)
-    cfg = {'max_items': cmdargs.max_items,
-           'filters': filter_list,
-           'output_format': cmdargs.output_format}
-
-    tmirror = FilterMirror(config=cfg)
-    try:
-        tmirror.sync(smirror, path)
-        if tmirror.output_format == FORMAT_JSON:
-            print(json.dumps(tmirror.json_entries, indent=2, sort_keys=True,
-                             separators=(',', ': ')))
-    except IOError as e:
-        if e.errno == errno.EPIPE:
-            sys.exit(0x80 | signal.SIGPIPE)
-        raise
-
-
-if __name__ == '__main__':
-    main()
-
-# vi: ts=4 expandtab syntax=python

=== removed file 'bin/sstream-sync'
--- bin/sstream-sync	2016-11-28 14:54:35 +0000
+++ bin/sstream-sync	1970-01-01 00:00:00 +0000
@@ -1,171 +0,0 @@
-#!/usr/bin/python3
-#   Copyright (C) 2013 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
-
-from simplestreams import mirrors
-from simplestreams.mirrors import command_hook
-from simplestreams import log
-from simplestreams import util
-
-import argparse
-import errno
-import os
-import signal
-import sys
-import yaml
-
-
-def which(program):
-    def is_exe(fpath):
-        return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
-
-    fpath, _fname = os.path.split(program)
-    if fpath:
-        if is_exe(program):
-            return program
-    else:
-        for path in os.environ["PATH"].split(os.pathsep):
-            path = path.strip('"')
-            exe_file = os.path.join(path, program)
-            if is_exe(exe_file):
-                return exe_file
-
-    return None
-
-
-def warn(msg):
-    sys.stderr.write("WARN: %s" % msg)
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    defhook = command_hook.DEFAULT_HOOK_NAME
-
-    hooks = [("--hook-%s" % hook.replace("_", "-"), hook, False)
-             for hook in command_hook.HOOK_NAMES]
-    hooks.append(('--hook', defhook, False,))
-
-    parser.add_argument('--config', '-c',
-                        help='read config file',
-                        type=argparse.FileType('rb'))
-
-    for (argname, cfgname, _required) in hooks:
-        parser.add_argument(argname, dest=cfgname, required=False)
-
-    parser.add_argument('--keep', action='store_true', default=False,
-                        dest='keep_items',
-                        help='keep items in target up to MAX items '
-                             'even after they have fallen out of the source')
-    parser.add_argument('--max', type=int, default=None, dest='max_items',
-                        help='store at most MAX items in the target')
-    parser.add_argument('--item-skip-download', action='store_true',
-                        default=False,
-                        help='Do not download items that are to be inserted.')
-    parser.add_argument('--delete', action='store_true', default=False,
-                        dest='delete_filtered_items',
-                        help='remove filtered items from the target')
-    parser.add_argument('--path', default=None,
-                        help='sync from index or products file in mirror')
-
-    parser.add_argument('--verbose', '-v', action='count', default=0)
-    parser.add_argument('--log-file', default=sys.stderr,
-                        type=argparse.FileType('w'))
-
-    parser.add_argument('--keyring', action='store', default=None,
-                        help='keyring to be specified to gpg via --keyring')
-    parser.add_argument('--no-verify', '-U', action='store_false',
-                        dest='verify', default=True,
-                        help="do not gpg check signed json files")
-
-    parser.add_argument('mirror_url')
-    cmdargs = parser.parse_args()
-
-    known_cfg = [('--item-skip-download', 'item_skip_download', False),
-                 ('--max', 'max_items', False),
-                 ('--keep', 'keep_items', False),
-                 ('--delete', 'delete_filtered_items', False),
-                 ('mirror_url', 'mirror_url', True),
-                 ('--path', 'path', True)]
-    known_cfg.extend(hooks)
-
-    cfg = {}
-    if cmdargs.config:
-        cfg = yaml.safe_load(cmdargs.config)
-        if not cfg:
-            cfg = {}
-
-    known_names = [i[1] for i in known_cfg]
-    unknown = [key for key in cfg if key not in known_names]
-    if unknown:
-        warn("unknown keys in config: %s\n" % str(unknown))
-
-    missing = []
-    fallback = cfg.get(defhook, getattr(cmdargs, defhook, None))
-
-    for (argname, cfgname, _required) in known_cfg:
-        val = getattr(cmdargs, cfgname)
-        if val is not None:
-            cfg[cfgname] = val
-        if val == "":
-            cfg[cfgname] = None
-
-        if ((cfgname in command_hook.HOOK_NAMES or cfgname == defhook) and
-                cfg.get(cfgname) is not None):
-            if which(cfg[cfgname]) is None:
-                msg = "invalid input for %s. '%s' is not executable\n"
-                sys.stderr.write(msg % (argname, val))
-                sys.exit(1)
-
-        if (cfgname in command_hook.REQUIRED_FIELDS and
-                cfg.get(cfgname) is None and not fallback):
-            missing.append((argname, cfgname,))
-
-    pfm = util.path_from_mirror_url
-    (cfg['mirror_url'], cfg['path']) = pfm(cfg['mirror_url'], cfg.get('path'))
-
-    if missing:
-        sys.stderr.write("must provide input for (--hook/%s for default):\n"
-                         % defhook)
-        for (flag, cfg) in missing:
-            sys.stderr.write("  cmdline '%s' or cfgname '%s'\n" % (flag, cfg))
-        sys.exit(1)
-
-    level = (log.ERROR, log.INFO, log.DEBUG)[min(cmdargs.verbose, 2)]
-    log.basicConfig(stream=cmdargs.log_file, level=level)
-
-    def policy(content, path):
-        if cfg['path'].endswith('sjson'):
-            return util.read_signed(content,
-                                    keyring=cmdargs.keyring,
-                                    checked=cmdargs.verify)
-        else:
-            return content
-
-    smirror = mirrors.UrlMirrorReader(cfg['mirror_url'], policy=policy)
-    tmirror = command_hook.CommandHookMirror(config=cfg)
-    try:
-        tmirror.sync(smirror, cfg['path'])
-    except IOError as e:
-        if e.errno == errno.EPIPE:
-            sys.exit(0x80 | signal.SIGPIPE)
-        raise
-
-
-if __name__ == '__main__':
-    main()
-
-# vi: ts=4 expandtab syntax=python

=== removed directory 'debian'
=== removed file 'debian/changelog.trunk'
--- debian/changelog.trunk	2013-09-30 17:12:03 +0000
+++ debian/changelog.trunk	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-simplestreams (0.1.0~bzrREVNO-1~trunk1) UNRELEASED; urgency=low
-
-  * Initial release
-
- -- Scott Moser <[e-mail]>  Tue, 26 Mar 2013 01:10:01 +0000
-

=== removed file 'debian/compat'
--- debian/compat	2013-03-26 01:24:58 +0000
+++ debian/compat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-7

=== removed file 'debian/control'
--- debian/control	2016-08-03 15:58:50 +0000
+++ debian/control	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-Source: simplestreams
-Section: python
-Priority: extra
-Standards-Version: 3.9.6
-Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: debhelper (>= 7),
-               dh-python,
-               make,
-               python-all,
-               python-glanceclient,
-               python-keystoneclient,
-               python-mock,
-               python-nose,
-               python-requests (>= 1.1),
-               python-setuptools,
-               python-yaml,
-               python3,
-               python3-flake8,
-               python3-mock,
-               python3-nose,
-               python3-requests (>= 1.1),
-               python3-setuptools,
-               python3-yaml
-Homepage: http://launchpad.net/simplestreams
-X-Python-Version: >= 2.7
-X-Python3-Version: >= 3.2
-
-Package: simplestreams
-Architecture: all
-Priority: extra
-Depends: python3-simplestreams,
-         python3-yaml,
-         ${misc:Depends},
-         ${python3:Depends}
-Replaces: python-simplestreams (<= 0.1.0~bzr230)
-Conflicts: python-simplestreams (<= 0.1.0~bzr230)
-Description: Library and tools for using Simple Streams data
- This package provides a client for interacting with simple
- streams data as is produced to describe Ubuntu's cloud images.
-
-Package: python3-simplestreams
-Architecture: all
-Priority: extra
-Depends: gnupg, ${misc:Depends}, ${python3:Depends}
-Suggests: python3-requests (>= 1.1)
-Description: Library and tools for using Simple Streams data
- This package provides a client for interacting with simple
- streams data as is produced to describe Ubuntu's cloud images.
-
-Package: python-simplestreams
-Architecture: all
-Priority: extra
-Depends: gnupg, python-boto, ${misc:Depends}, ${python:Depends}
-Suggests: python-requests (>= 1.1)
-Description: Library and tools for using Simple Streams data
- This package provides a client for interacting with simple
- streams data as is produced to describe Ubuntu's cloud images.
-
-Package: python-simplestreams-openstack
-Architecture: all
-Priority: extra
-Depends: python-glanceclient,
-         python-keystoneclient,
-         python-simplestreams,
-         python-swiftclient,
-         ${misc:Depends}
-Description: Library and tools for using Simple Streams data
- This package depends on libraries necessary to use the openstack dependent
- functionality in simplestreams.  That includes interacting with glance,
- swift and keystone.

=== removed file 'debian/copyright'
--- debian/copyright	2015-12-08 20:29:22 +0000
+++ debian/copyright	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: simplestreams
-Upstream-Contact: Scott Moser <[e-mail]>
-Source: https://launchpad.net/simplestreams
-
-Files: *
-Copyright: 2013, Canonical Ltd.
-License: AGPL-3
- GNU AFFERO GENERAL PUBLIC LICENSE
- Version 3, 19 November 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.
- .
- The complete text of the AGPL version 3 can be seen in
- http://www.gnu.org/licenses/agpl-3.0.html

=== removed file 'debian/python-simplestreams.install'
--- debian/python-simplestreams.install	2013-06-28 19:56:56 +0000
+++ debian/python-simplestreams.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/python2*/*-packages/simplestreams/*

=== removed file 'debian/python3-simplestreams.install'
--- debian/python3-simplestreams.install	2013-06-26 18:22:11 +0000
+++ debian/python3-simplestreams.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/python3*/*-packages/simplestreams/*

=== removed file 'debian/rules'
--- debian/rules	2015-12-08 20:29:22 +0000
+++ debian/rules	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/usr/bin/make -f
-
-export SS_REQUIRE_DISTRO_INFO = 0
-PYVERS := $(shell pyversions -r)
-PY3VERS := $(shell py3versions -r)
-%:
-	dh $@ --with=python2,python3
-
-override_dh_auto_install:
-	dh_auto_install
-	set -ex; for python in $(PY3VERS) $(PYVERS); do \
-		$$python setup.py build --executable=/usr/bin/python3 && \
-		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
-	done
-	# there:are no packages for python3-{boto, swiftclient,
-	# glanceclient, keystonclient}, so do not package the bits
-	# that would depend on them.
-	for bad in openstack mirrors/glance objectstores/swift objectstores/s3; do \
-		rm $(CURDIR)/debian/tmp/usr/lib/python3/*/simplestreams/$$bad.py; done

=== removed file 'debian/simplestreams.install'
--- debian/simplestreams.install	2013-06-28 19:56:56 +0000
+++ debian/simplestreams.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/bin/*
-usr/lib/simplestreams/hook-debug usr/share/doc/simplestreams/

=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2013-03-27 15:10:42 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (quilt)

=== removed directory 'doc'
=== removed file 'doc/README'
--- doc/README	2014-09-23 13:08:39 +0000
+++ doc/README	1970-01-01 00:00:00 +0000
@@ -1,161 +0,0 @@
-== Simple Sync Format ==
-Simple Sync format consists of 2 different file formats:
- * A "products list" (format=products:1.0)
- * A "index" (format=index:1.0)
-
-Files contain JSON formatted data.
-Data can come in one of 2 formats:
- * JSON file: <file>.json
-   A .json file can be accompanied by a .json.gpg file which contains
-   signature data for .json file.
-
-   Due to race conditions caused by the fact that .json and .json.gpg
-   may not be able to be obtained from a storage location at the same
-   time, the preferred delivery of signed data is via '.sjson' format.
-
- * Signed JSON File: <file>.sjson
-   This is a GPG cleartext signed message:
-      https://tools.ietf.org/html/rfc4880#section-7
-   The payload the same content that would be included in the JSON file.
-
-Special dictionary entries:
- * 'path': If a 'product' dictionary in an index file or a item dictionary
-   in a products file contains a 'path' element, then that indicates there
-   is content to be downloaded associated with that element.
-
-   A 'path' must value must be relative to the base of the mirror.
-
- * 'md5', 'sha256', 'sha512':
-   If an item contains a 'path' and one of these fields, then the content
-   referenced must have the given checksum(s).
-
- * 'size':
-   For an item with a 'path', this indicates the expected download size.
-   It should be present for a item with a path in a products file.
-   Having access to expected size allows the client to provide progress
-   and also reduces the potential for hash collision attacks.
-
- * 'updated'
-   This field can exist at the top level of a products or index, and
-   contains a RFC 2822 timestamp indicating when the file was last updated
-   This allows a client to quickly note that it is up to date.
-
-== Simple Sync Mirrors ==
-The default/expected location of an index file is 'streams/v1/index.sjson'
-or 'streams/v1/index.json' underneath the top level of a mirror.
-
-'path' entries as described above are relative to the top level of a
-mirror, not relative to the location of the index.
-
-For example:
- http://example.com/my-mirror/
-would be the top level of a mirror, and the expected path of an index is
- http://example.com/my-mirror/streams/v1/index.sjson
-
-To describe a file that lives at:
- http://example.com/my-mirror/streams/v1/products.sjson
-
-The 'path' element must be: 'streams/v1/products.sjson'
-
-== Products List ==
-products list: (format=products:1.0)
-For Ubuntu, an example product is 'server:precise:amd64'
-A Products list has a 'content_id' and multiple products.
-a product has multiple versions
-a version has multiple items
-
-An item can be globally uniquely identified by the path to it.
-i.e., the 'content_id' for a products list and the key in each
-element of the tree form a unique tuple for that item.  Given:
-  content_id = tree['content_id']
-  prod_name =  tree['products'].keys()[0]
-  ver_name =   tree['products'][prod_name]['versions'].keys(0)
-  item_name =  tree['products'][prod_name]['versions'][ver_name].keys(0)
-that unique tuple is:
-  (content_id, prod_name, ver_name, item_name)
-
-The following is a description of each of these fields:
-  * content_id is formed similarly to an ISCSI qualified name (IQN)
-    An example is:
-       com.ubuntu.cloud:released:aws
-    It should have a reverse domain portion followed by a portion
-    that represents a name underneath that domain.
-
-  * product_name: product name is unique within a products list.  The same
-    product name may appear in multiple products_lists.  For example,
-    in Ubuntu, 'server:precise:amd64' will appear in both
-    'com.ubuntu.cloud:released:aws' and
-    'com.ubuntu.cloud:released:download'.
-
-    That name collision should imply that the two separate
-    <content_id><product_name> pairs are equivalent in some manner.
-
-  * version_name:
-    A 'version' of a product represents a release, build or collection of
-    that product.  A key in the 'versions' dictionary should be sortable
-    by rules of a 'LANG=C sort()'.  That allows the client to trivially
-    order versions to find the most recent.  Ubuntu uses "serial" numbers
-    for these keys, in the format YYYYMMDD[.0-9].
-
-  * item_name:
-    Inside of a version, there may be multiple items.  An example would be
-    a binary build and a source tarball.
-
-    For Ubuntu download images, these are things like '.tar.gz',
-    '-disk1.img' and '-root.tar.gz'.
-
-    The item name does not need to be user-friendly.  It must be
-    consistent.  Because this id is unique within the given
-    'version_name', a client needs only to store that key, rather than
-    trying to determine which keys inside the item dictionary identify it.
-
-    An 'item' dictionary may contain a 'path' element.
-
-    'path' entries for a given item must be immutable.  That is, for a
-    given 'path' under a mirror, the content must never change.
-
-== Index ==
-This is a index of products files that are available.
-It has a top level 'index' dictionary.  Each entry in that dictionary is a
-content_id of a products file.  The entry should have a 'path' item that
-indicates where to download the product.
-
-All other data inside the product entry is not required, but helps a client
-to find what they're looking for.
-
-item groups of the same "type".
-   this is 'stream:1.0' format.
- * stream collection: a list of content streams
-   A stream collection is simply a way to provide an index of known content
-   streams, and information about them.
-   This is 'stream-collection:1.0'
-
-Useful definitions
- * item group
-   an item group is a list of like items. e.g. all produced by the same build.
-   requirements:
-    * serial: a 'serial' entry that can be sorted by YYYYMMDD[.X]
-    * items: a list of items
-
-   Example item groups are:
-    * output of the amd64 cloud image build done on 2012-04-04
-    * amd64 images from the cirros release version 0.3.1
-
- * item
-   There are 1 or more items in a item group.
-   requirements:
-    * name: must be unique within the item group.
-
-   special fields:
-    * path: If an item has a 'path', then the target must be obtainable and
-      should be downloaded when mirroring.
-    * md5sum: stores checksum
-
-   Example:
-    * "disk1.img" produced from the amd64 cloud image build done on 2012-04-04
-    * -root.tar.gz produced from the same build.
-
-Notes:
- * index files are not required to be signed, as they only
-   contain references to other content that is signed, and that is hosted
-   on the same mirror.

=== removed directory 'doc/files'
=== removed file 'doc/files/my.cfg'
--- doc/files/my.cfg	2013-01-28 21:59:54 +0000
+++ doc/files/my.cfg	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# This is an example CommandHookMirror config
-#  You can utilize it with:
-#   export MIRROR_D=mirror.out; ./tools/cmd-hook-sync hook.cfg doc/example ${MIRROR_D}
-#
-stream_load: |
-  for d in "${MIRROR_D}/%(iqn)s/"*; do [ -d "$d" ] && echo "${d##*/}"; done;
-  true
-
-item_insert: |
-  echo "%(_hookname)s: %(iqn)s/%(serial)s/%(name)s"
-  cp "%(path_local)s" "$MIRROR_D/%(iqn)s/%(serial)s/%(name)s"
-
-group_insert_pre: |
-  echo "%(_hookname)s: %(iqn)s/%(serial)s"
-  mkdir -p "$MIRROR_D/%(iqn)s/%(serial)s"
-
-group_remove_post: |
-  echo "%(_hookname)s: %(iqn)s/%(serial)s"
-  rm -Rf "$MIRROR_D/%(iqn)s/%(serial)s"
-
-# ignore files unless they have match the provided regex
-item_filter:
-  echo "%(name)s" | grep -q "disk1.img"
-
-# vi: ts=4 expandtab syntax=yaml

=== removed file 'doc/files/openstack-sync.cfg'
--- doc/files/openstack-sync.cfg	2013-01-29 22:15:09 +0000
+++ doc/files/openstack-sync.cfg	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-# This is an example CommandHookMirror config for uploading to glance
-# PYTHONPATH=$PWD ./tools/cmd-hook-sync ./my.cfg \
-#     http://download.cirros-cloud.net/streams/v1/unsigned/streams.yaml
-stream_load: |
-  set -e; set -f;
-  iqn="%(iqn)s"
-  output=$(glance image-list --property-filter "iqn=$iqn")
-  ids=$(echo "$output" | awk '$2 ~ uuid { print $2 }' "uuid=[0-9a-f-]{36}")
-  for id in $ids; do
-    out=$(glance image-show $id)
-    serial=$(echo "$out" |
-      awk '$2 == "Property" && $3 == sname { print $5 }' sname="'serial'")
-    # for debug, list what we find to stderr
-    echo "$iqn $serial $id" 1>&2
-    # report we have the given serial for this iqn
-    echo "$serial"
-  done
-
-item_insert: |
-  iqn="%(iqn)s"
-  serial="%(serial)s"
-  path_local="%(path_local)s"
-
-  [ "${arch}" = "amd64" ] && arch="x86_64"
-
-  uuid=$(uuidgen)
-  glance image-create --disk-format=qcow2 --container-format=bare \
-     "--name=${pubname:-${name##*/}}" "--id=$uuid" \
-     ${arch:+"--property=architecture=${arch}"} \
-     "--property=iqn=$iqn" "--property=serial=$serial" \
-     ${md5:+"--checksum=$md5"} \
-     "--file=${path_local}"
-
-group_remove_pre: |
-  iqn="%(iqn)s"
-  serial="%(serial)s"
-
-  set -e; set -f;
-  output=$(glance image-list "--property-filter=iqn=$iqn" \
-    "--property-filter=serial=$serial")
-  ids=$(echo "$output" | awk '$2 ~ uuid { print $2 }' "uuid=[0-9a-f-]{36}")
-  for id in $ids; do
-    echo "remove $iqn $serial $id"
-    glance image-delete "$id";
-  done
-
-# ignore files unless they have match the provided regex
-item_filter:
-  echo "%(name)s" | grep -q "disk.img$"
-
-# vi: ts=4 expandtab syntax=yaml

=== removed directory 'examples'
=== removed directory 'examples/cirros'
=== removed directory 'examples/cirros/streams'
=== removed directory 'examples/cirros/streams/v1'
=== removed file 'examples/cirros/streams/v1/index.json'
--- examples/cirros/streams/v1/index.json	2013-05-15 12:54:54 +0000
+++ examples/cirros/streams/v1/index.json	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-{
- "index": {
-  "net.cirros-cloud:devel:download": {
-   "datatype": "image-downloads", 
-   "path": "streams/v1/net.cirros-cloud:devel:download.json", 
-   "updated": "Sat, 04 May 2013 01:58:57 +0000", 
-   "products": [
-    "net.cirros-cloud.devel:standard:0.3:arm", 
-    "net.cirros-cloud.devel:standard:0.3:i386", 
-    "net.cirros-cloud.devel:standard:0.3:x86_64"
-   ], 
-   "format": "products:1.0"
-  }, 
-  "net.cirros-cloud:released:download": {
-   "datatype": "image-downloads", 
-   "path": "streams/v1/net.cirros-cloud:released:download.json", 
-   "updated": "Sat, 04 May 2013 01:58:57 +0000", 
-   "products": [
-    "net.cirros-cloud:standard:0.3:i386", 
-    "net.cirros-cloud:standard:0.3:x86_64", 
-    "net.cirros-cloud:standard:0.3:arm"
-   ], 
-   "format": "products:1.0"
-  }
- }, 
- "updated": "Sat, 04 May 2013 01:58:57 +0000", 
- "format": "index:1.0"
-}

=== removed file 'examples/cirros/streams/v1/net.cirros-cloud:devel:download.json'
--- examples/cirros/streams/v1/net.cirros-cloud:devel:download.json	2013-05-15 12:54:54 +0000
+++ examples/cirros/streams/v1/net.cirros-cloud:devel:download.json	1970-01-01 00:00:00 +0000
@@ -1,311 +0,0 @@
-{
- "datatype": "image-downloads", 
- "updated": "Sat, 04 May 2013 01:58:57 +0000", 
- "content_id": "net.cirros-cloud:devel:download", 
- "products": {
-  "net.cirros-cloud.devel:standard:0.3:arm": {
-   "arch": "arm", 
-   "stream": "devel", 
-   "versions": {
-    "20130111": {
-     "items": {
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-arm-uec.tar.gz", 
-       "sha256": "2b77d7c4225793b7271f550310f6e0827b64434b88fec589dd97e98e8828d254", 
-       "md5": "797e2d488c799eab0a8eb09a9c1ff4a3", 
-       "size": 7314153
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-arm-rootfs.img.gz", 
-       "sha256": "ff2d70f474ee78209083d88caa04add60ada5cb71cfec57a69f6b696ef57eee2", 
-       "md5": "986c9cabd412f12cb5027b7d7eb4ec03", 
-       "size": 10949810
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-arm-lxc.tar.gz", 
-       "sha256": "a9225fed02b071d0cf9a60cb3d17578d19714b9de3fe4083e34eb3c1110f3f83", 
-       "md5": "55b092bde364aad125a1db57c932f1d0", 
-       "size": 3466163
-      }
-     }, 
-     "version": "0.3.1~pre4", 
-     "pubname": "cirros-0.3.1~pre4-arm"
-    }, 
-    "20120611": {
-     "items": {
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-arm-uec.tar.gz", 
-       "sha256": "679823406624c380a1d3c5af659a41aab25ff42007b0eb0a7afd4b58142e738e", 
-       "md5": "22bb53be0daf975e35a4fbc856ae89c2", 
-       "size": 7173849
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-arm-rootfs.img.gz", 
-       "sha256": "5dd775b57a624108c82838a47e57aee576955ca162c2e8c2e50ee8ffea5f93d2", 
-       "md5": "ad7422c2124c59466724dea9658db20f", 
-       "size": 10762344
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-arm-lxc.tar.gz", 
-       "sha256": "8e619113cfeb0a799b89dd570fd3c978ac83b5f78ea7b257a3b2e2a2bb2de30c", 
-       "md5": "b0a7d585b42d8cfff18e2a76c5115495", 
-       "size": 3428595
-      }
-     }, 
-     "version": "0.3.1~pre1", 
-     "pubname": "cirros-0.3.1~pre1-arm"
-    }, 
-    "20120827": {
-     "items": {
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-arm-uec.tar.gz", 
-       "sha256": "cc5362c2c9e84547100aed3e6df0011e2b4d91c47243c85de2643d1d72ed3946", 
-       "md5": "d1703407ad1483e2bbf68d4d78987581", 
-       "size": 7302383
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-arm-rootfs.img.gz", 
-       "sha256": "dc5c0f6f02592d6af164ae175b5f5e69d5d016734672982e9b4f29294782e61a", 
-       "md5": "c98688744bdf66b56b19405acfc48966", 
-       "size": 10922886
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-arm-lxc.tar.gz", 
-       "sha256": "136e2d3a4a870eb6a4b3dcbde44209bcd050d36b3c20c2a1f21f4dd7f6e00004", 
-       "md5": "fbc83952ca51071c1aea8b0d82c51d1b", 
-       "size": 3456925
-      }
-     }, 
-     "version": "0.3.1~pre3", 
-     "pubname": "cirros-0.3.1~pre3-arm"
-    }
-   }
-  }, 
-  "net.cirros-cloud.devel:standard:0.3:i386": {
-   "arch": "i386", 
-   "stream": "devel", 
-   "versions": {
-    "20130111": {
-     "items": {
-      "disk.img": {
-       "ftype": "disk.img", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-i386-disk.img", 
-       "sha256": "ac09fe84e4aa5315b017ee8a522dcf0f2780ebd27b9a9eaca56a24c5e0818977", 
-       "md5": "108c6f694a10b5376bde18e71a238ae0", 
-       "size": 12380672
-      }, 
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-i386-uec.tar.gz", 
-       "sha256": "da62e3351c60bf40ab2b07d808aed8e0cbeed1df0b766c3870aab29330569614", 
-       "md5": "c078a3e7b7c758a69217391f54fa4cba", 
-       "size": 8195614
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-i386-rootfs.img.gz", 
-       "sha256": "3944219a3957a787735a54bdc267e2daf6c7c2e02cb4fac133ae8fa6ba4bfbaa", 
-       "md5": "538576ec0ca05ab9eaf1ada9fc7f3084", 
-       "size": 11566741
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-i386-lxc.tar.gz", 
-       "sha256": "a4ff395c1e9bf8dda5b7e25f75fdc90f9726631ffb5f6df821be0da0209dd7ef", 
-       "md5": "ae66a7dd1c050f4d313d1fe8febd87d0", 
-       "size": 3192308
-      }
-     }, 
-     "version": "0.3.1~pre4", 
-     "pubname": "cirros-0.3.1~pre4-i386"
-    }, 
-    "20120611": {
-     "items": {
-      "disk.img": {
-       "ftype": "disk.img", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-i386-disk.img", 
-       "sha256": "3a453c98a4f46cb9b8acc34e4d2b39b8d9315082f80cefc4659320741ab94fcf", 
-       "md5": "483f1377c284b5ba61e8038a7bb53849", 
-       "size": 12204544
-      }, 
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-i386-uec.tar.gz", 
-       "sha256": "ceaea29b7808e434712cac7380659367aa41e049810fab53a36d6ecfe5ae014c", 
-       "md5": "b5a730c2cfd08c78e8af41be06082a46", 
-       "size": 8165911
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-i386-rootfs.img.gz", 
-       "sha256": "751fc761ab9e1db5ddb156cb8d54f0bb67e68bf82a92e700f9e280d6da0cad79", 
-       "md5": "e413bfe8627aef63bc8c4cb96954f1e3", 
-       "size": 11494115
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-i386-lxc.tar.gz", 
-       "sha256": "e727a344cc19caf173b376bdf1321f13dded5eaa83d47eba0c65354e7a6d5c81", 
-       "md5": "04d84c5ed7f4d2ced01a7da82a4d573b", 
-       "size": 3158748
-      }
-     }, 
-     "version": "0.3.1~pre1", 
-     "pubname": "cirros-0.3.1~pre1-i386"
-    }, 
-    "20120827": {
-     "items": {
-      "disk.img": {
-       "ftype": "disk.img", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-i386-disk.img", 
-       "sha256": "4f531df04463eb9fd4a4ca05d013f6e48ef66bf87287a3d22037a6d845784390", 
-       "md5": "919b7f3c9d1740f57cc208acbf098ae5", 
-       "size": 12287488
-      }, 
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-i386-uec.tar.gz", 
-       "sha256": "5df8c17124c5f0b5a38c8cdd763c6432d5ca8b32f6148ffc8e77486a36cdd0f5", 
-       "md5": "04dfffbb656e536775d522148bc031b2", 
-       "size": 8184352
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-i386-rootfs.img.gz", 
-       "sha256": "d99a1eee31ee469eaf5cac51de711071282112b8b1d398759db92eefe1daf83e", 
-       "md5": "a9f6519bf540331d74c3f938b7752ce9", 
-       "size": 11546128
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-i386-lxc.tar.gz", 
-       "sha256": "9cf93aeefdb00601bdf44401adf5c89473883ae408fee0a9d65ed8dd355c2cac", 
-       "md5": "8f59168a9f5b4962d3327f50d5d18ad7", 
-       "size": 3186156
-      }
-     }, 
-     "version": "0.3.1~pre3", 
-     "pubname": "cirros-0.3.1~pre3-i386"
-    }
-   }
-  }, 
-  "net.cirros-cloud.devel:standard:0.3:x86_64": {
-   "arch": "x86_64", 
-   "stream": "devel", 
-   "versions": {
-    "20130111": {
-     "items": {
-      "disk.img": {
-       "ftype": "disk.img", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-x86_64-disk.img", 
-       "sha256": "6f50d6a8874610ad25196cad3296e0cb55274fb3aa6963cef04012b413cca3af", 
-       "md5": "c32b60592301c1cf714a93fea0a25352", 
-       "size": 13118976
-      }, 
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-x86_64-uec.tar.gz", 
-       "sha256": "bb31bb2372f66949799f0ee7f272078e1d0339f3f790d40f1dbcadf9c24225f3", 
-       "md5": "414dc72831718ebaaf8a994b59e71f62", 
-       "size": 8633179
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-x86_64-rootfs.img.gz", 
-       "sha256": "8f14fa9de3deee186fc2fa7778913f93d93f0fb0d2e0436d7e2af92f0b98f5e6", 
-       "md5": "8cc226def4fa6a50b4dbb0ebae57675e", 
-       "size": 12343217
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1~pre4/cirros-0.3.1~pre4-x86_64-lxc.tar.gz", 
-       "sha256": "867bc516aa0721ed7c4e7069249f8f891c7f186b7d7cecc3c131ef4225c6df4d", 
-       "md5": "019857146c4d5c2f99fa03c04ba300db", 
-       "size": 3534613
-      }
-     }, 
-     "version": "0.3.1~pre4", 
-     "pubname": "cirros-0.3.1~pre4-x86_64"
-    }, 
-    "20120611": {
-     "items": {
-      "disk.img": {
-       "ftype": "disk.img", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-x86_64-disk.img", 
-       "sha256": "0cfdda25485a0b51cc9356199446028403e0745699011265ff304dd51ce3b36b", 
-       "md5": "8875836383dcf5de32e708945a5455b5", 
-       "size": 12992512
-      }, 
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-x86_64-uec.tar.gz", 
-       "sha256": "1d45297df580bef76ec2c2303124e4673b76c2b61c4a1064581171b0f8e35a79", 
-       "md5": "af842e35f335fc55c78311303474b121", 
-       "size": 8602015
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-x86_64-rootfs.img.gz", 
-       "sha256": "99c2c0f64f51d1184311597c87f3911799c345786a6987fd76fe742d5ef29481", 
-       "md5": "980984e8787426059edf4ab6fe1e680f", 
-       "size": 12277772
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1~pre1/cirros-0.3.1~pre1-x86_64-lxc.tar.gz", 
-       "sha256": "f32cc1a108322c9b8967d97c301d4d9412bf31a321cea026773d932a5594dab6", 
-       "md5": "d68c898e4f4e8afc9221e7c8f4f34e7d", 
-       "size": 3497630
-      }
-     }, 
-     "version": "0.3.1~pre1", 
-     "pubname": "cirros-0.3.1~pre1-x86_64"
-    }, 
-    "20120827": {
-     "items": {
-      "disk.img": {
-       "ftype": "disk.img", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-x86_64-disk.img", 
-       "sha256": "3471124e2943922fe2a14ef06ef051c8b21e43835de7a06c58b33035b4124943", 
-       "md5": "4b65df206c61e30af1947ee21d5aad40", 
-       "size": 13089280
-      }, 
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-x86_64-uec.tar.gz", 
-       "sha256": "901b13ea2f4f9216e859c1f90f5acc36b85468043ba243b75a919a9e34a4a70d", 
-       "md5": "0a4cb79338406b275ad0d5be08c9e0dd", 
-       "size": 8623028
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-x86_64-rootfs.img.gz", 
-       "sha256": "cba564b4f9176ba0efceb09f646a38485c647e938b7d1150c1b8d00e012905b1", 
-       "md5": "1c649a0761e80e6e81b34371e3186deb", 
-       "size": 12328845
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1~pre3/cirros-0.3.1~pre3-x86_64-lxc.tar.gz", 
-       "sha256": "9abee551668c7afada5b550d6f5760c105ba8b0011e37cbe77985b3834862395", 
-       "md5": "9fb61f717b367c0d0459eada51fee35f", 
-       "size": 3527698
-      }
-     }, 
-     "version": "0.3.1~pre3", 
-     "pubname": "cirros-0.3.1~pre3-x86_64"
-    }
-   }
-  }
- }, 
- "format": "products:1.0"
-}

=== removed file 'examples/cirros/streams/v1/net.cirros-cloud:released:download.json'
--- examples/cirros/streams/v1/net.cirros-cloud:released:download.json	2013-05-15 12:54:54 +0000
+++ examples/cirros/streams/v1/net.cirros-cloud:released:download.json	1970-01-01 00:00:00 +0000
@@ -1,216 +0,0 @@
-{
- "datatype": "image-downloads", 
- "updated": "Sat, 04 May 2013 01:58:57 +0000", 
- "content_id": "net.cirros-cloud:released:download", 
- "products": {
-  "net.cirros-cloud:standard:0.3:i386": {
-   "arch": "i386", 
-   "stream": "released", 
-   "versions": {
-    "20111020": {
-     "items": {
-      "disk.img": {
-       "ftype": "disk.img", 
-       "path": "0.3.0/cirros-0.3.0-i386-disk.img", 
-       "sha256": "3309675d0d409128b1c2651d576bc8092ca9ab93e15f3d3aa458f40947569b61", 
-       "md5": "90169ba6f09b5906a7f0755bd00bf2c3", 
-       "size": 9159168
-      }, 
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.0/cirros-0.3.0-i386-uec.tar.gz", 
-       "sha256": "b57e0acb32852f89734ff11a511ae0897e8cecb41882d03551649289b6854a1b", 
-       "md5": "115ca6afa47089dc083c0dc9f9b7ff03", 
-       "size": 6596586
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.0/cirros-0.3.0-i386-rootfs.img.gz", 
-       "sha256": "981eb0be5deed016a6b7d668537a2ca8c7c8f8ac02f265acb63eab9a8adc4b98", 
-       "md5": "174d97541fadaf4e88d526f656c1e0a5", 
-       "size": 8566441
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.0/cirros-0.3.0-i386-lxc.tar.gz", 
-       "sha256": "cac7887628527604b65a89e8caa34096d51c2dc1acfe405c15db2fc58495142a", 
-       "md5": "e760bf470841f57c2c1bb426d407d169", 
-       "size": 1845928
-      }
-     }, 
-     "version": "0.3.0", 
-     "pubname": "cirros-0.3.0-i386"
-    }, 
-    "20130207": {
-     "items": {
-      "disk.img": {
-       "ftype": "disk.img", 
-       "path": "0.3.1/cirros-0.3.1-i386-disk.img", 
-       "sha256": "b8aa1ce5d11939eaa01205fc31348532a31b82790921d45ceb397fbe76492787", 
-       "md5": "6ba617eafc992e33e7c141c679225e53", 
-       "size": 12251136
-      }, 
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1/cirros-0.3.1-i386-uec.tar.gz", 
-       "sha256": "88dda2e505b862a95d0e0044013addcaa3200e602150c9d73e32c2e29345d6f3", 
-       "md5": "52845de5142e58faf211e135d2b45721", 
-       "size": 8197543
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1/cirros-0.3.1-i386-rootfs.img.gz", 
-       "sha256": "27decd793c659063988dbb48ecd159a3f6664f9552d0fda9c58ce8984af5ba54", 
-       "md5": "cf14209217f41ea26844bf0b9cdd20ef", 
-       "size": 11565966
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1/cirros-0.3.1-i386-lxc.tar.gz", 
-       "sha256": "70a8c9c175589f7ac7054c6151cf2bb7eb9e210cefbe310446df2fb1a436b504", 
-       "md5": "fc404d9fc9dc5f0eb33ebaa03920a046", 
-       "size": 3191593
-      }
-     }, 
-     "version": "0.3.1", 
-     "pubname": "cirros-0.3.1-i386"
-    }
-   }
-  }, 
-  "net.cirros-cloud:standard:0.3:x86_64": {
-   "arch": "x86_64", 
-   "stream": "released", 
-   "versions": {
-    "20111020": {
-     "items": {
-      "disk.img": {
-       "ftype": "disk.img", 
-       "path": "0.3.0/cirros-0.3.0-x86_64-disk.img", 
-       "sha256": "648782e9287288630250d07531fed9944ecc3986764a6664f0bf6c050ec06afd", 
-       "md5": "50bdc35edb03a38d91b1b071afb20a3c", 
-       "size": 9761280
-      }, 
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.0/cirros-0.3.0-x86_64-uec.tar.gz", 
-       "sha256": "043a3e090a5d76d23758a3919fcaff93f77ce7b97594d9d10fc8d00e85f83191", 
-       "md5": "f56d3cffa47b7d209d2b6905628f07b9", 
-       "size": 6957349
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.0/cirros-0.3.0-x86_64-rootfs.img.gz", 
-       "sha256": "fb0f51c0ec8cfae9d2cef18e4897142e6a81688378fc52f3836ddb5d027a6761", 
-       "md5": "83cd7edde7c99ae520e26d338d397875", 
-       "size": 9184057
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.0/cirros-0.3.0-x86_64-lxc.tar.gz", 
-       "sha256": "0e78796a30641dd7184f752c302a87d66f1eba9985c876911e4f26b4d8ba4a88", 
-       "md5": "1a480e5150db4d93be2aa3c9ced94fa1", 
-       "size": 2115217
-      }
-     }, 
-     "version": "0.3.0", 
-     "pubname": "cirros-0.3.0-x86_64"
-    }, 
-    "20130207": {
-     "items": {
-      "disk.img": {
-       "ftype": "disk.img", 
-       "path": "0.3.1/cirros-0.3.1-x86_64-disk.img", 
-       "sha256": "e01302fb2d2b13ae65226a0300335172e4487bbe60bb1e5c8b0843a25f126d34", 
-       "md5": "d972013792949d0d3ba628fbe8685bce", 
-       "size": 13147648
-      }, 
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1/cirros-0.3.1-x86_64-uec.tar.gz", 
-       "sha256": "51eb03b83123a68d4f866c7c15b195204e62db9e33475509a38b79b3122cde38", 
-       "md5": "e1849016cb71a00808093b7bf986f36a", 
-       "size": 8633554
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1/cirros-0.3.1-x86_64-rootfs.img.gz", 
-       "sha256": "8af2572729827ef89eabcdba36eaa130abb04e83e5910a0c20009ef48f4be237", 
-       "md5": "069f6411ea252bf4b343953017f35968", 
-       "size": 12339939
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1/cirros-0.3.1-x86_64-lxc.tar.gz", 
-       "sha256": "a086fcf2758468972d45957dc78ec6317c06f356930dbbc6cad6a8d1855f135e", 
-       "md5": "38252f1a49fec0ebedebc820854497e0", 
-       "size": 3534564
-      }
-     }, 
-     "version": "0.3.1", 
-     "pubname": "cirros-0.3.1-x86_64"
-    }
-   }
-  }, 
-  "net.cirros-cloud:standard:0.3:arm": {
-   "arch": "arm", 
-   "stream": "released", 
-   "versions": {
-    "20111020": {
-     "items": {
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.0/cirros-0.3.0-arm-uec.tar.gz", 
-       "sha256": "b871823406f818430f57744333b1bb17ce0047e551a316f316641f1bd70d9152", 
-       "md5": "c31e05f7829ad45f9d9995c35d232769", 
-       "size": 5761642
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.0/cirros-0.3.0-arm-rootfs.img.gz", 
-       "sha256": "731821e5293f6b66688a2127094537ce79c103f45a82b27b00a08992e3aa5a7a", 
-       "md5": "b268cfa7e634f070af401f8169adff79", 
-       "size": 7914961
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.0/cirros-0.3.0-arm-lxc.tar.gz", 
-       "sha256": "fcd3723c956a1c232730dc28513b466657cbe984232ba2fcc30a4e1f55aa91e9", 
-       "md5": "91add49e56cbe6b5004015a4d2f51dbc", 
-       "size": 2043822
-      }
-     }, 
-     "version": "0.3.0", 
-     "pubname": "cirros-0.3.0-arm"
-    }, 
-    "20130207": {
-     "items": {
-      "uec.tar.gz": {
-       "ftype": "uec.tar.gz", 
-       "path": "0.3.1/cirros-0.3.1-arm-uec.tar.gz", 
-       "sha256": "09dcd3ea6f1d48b3519232973e4dc00fc5e73cbea974cda6b5f7cfa380c6b428", 
-       "md5": "d04e6f26aed123bba2c096581b269e7f", 
-       "size": 7314471
-      }, 
-      "rootfs.img.gz": {
-       "ftype": "rootfs.img.gz", 
-       "path": "0.3.1/cirros-0.3.1-arm-rootfs.img.gz", 
-       "sha256": "9841beefe7a60969585d07cb9f403ce8e73fd56f47b13f8ed111443a0ca50fb3", 
-       "md5": "24205ff08d67b94b13588cee256e83b3", 
-       "size": 10945168
-      }, 
-      "lxc.tar.gz": {
-       "ftype": "lxc.tar.gz", 
-       "path": "0.3.1/cirros-0.3.1-arm-lxc.tar.gz", 
-       "sha256": "2060e59e642b3b2bdf6e34aba3ed15f468bc6f9a8417fc196d01d29b2075493e", 
-       "md5": "7ddea367ecb7ecb91554e18bed7c71bd", 
-       "size": 3466149
-      }
-     }, 
-     "version": "0.3.1", 
-     "pubname": "cirros-0.3.1-arm"
-    }
-   }
-  }
- }, 
- "format": "products:1.0"
-}

=== removed directory 'examples/foocloud'
=== removed directory 'examples/foocloud/files'
=== removed directory 'examples/foocloud/files/beta-2'
=== removed file 'examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64-disk1.img'
--- examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64-disk1.img	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64-disk1.img	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-beta2-server-cloudimg-amd64-disk1.img

=== removed file 'examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64-root.tar.gz'
--- examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64-root.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64-root.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-beta2-server-cloudimg-amd64-root.tar.gz

=== removed file 'examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64.tar.gz'
--- examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-beta2-server-cloudimg-amd64.tar.gz

=== removed file 'examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386-disk1.img'
--- examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386-disk1.img	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386-disk1.img	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-beta2-server-cloudimg-i386-disk1.img

=== removed file 'examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386-root.tar.gz'
--- examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386-root.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386-root.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-beta2-server-cloudimg-i386-root.tar.gz

=== removed file 'examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386.tar.gz'
--- examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-beta2-server-cloudimg-i386.tar.gz

=== removed directory 'examples/foocloud/files/release-20121001'
=== removed file 'examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64-disk1.img'
--- examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64-disk1.img	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64-disk1.img	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-amd64-disk1.img

=== removed file 'examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64-root.tar.gz'
--- examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64-root.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64-root.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-amd64-root.tar.gz

=== removed file 'examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64.tar.gz'
--- examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-amd64.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-amd64.tar.gz

=== removed file 'examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386-disk1.img'
--- examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386-disk1.img	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386-disk1.img	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-i386-disk1.img

=== removed file 'examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386-root.tar.gz'
--- examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386-root.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386-root.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-i386-root.tar.gz

=== removed file 'examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386.tar.gz'
--- examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121001/foovendor-6.1-server-cloudimg-i386.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-i386.tar.gz

=== removed directory 'examples/foocloud/files/release-20121026.1'
=== removed file 'examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64-disk1.img'
--- examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64-disk1.img	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64-disk1.img	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-amd64-disk1.img

=== removed file 'examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64-root.tar.gz'
--- examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64-root.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64-root.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-amd64-root.tar.gz

=== removed file 'examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64.tar.gz'
--- examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-amd64.tar.gz

=== removed file 'examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386-disk1.img'
--- examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386-disk1.img	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386-disk1.img	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-i386-disk1.img

=== removed file 'examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386-root.tar.gz'
--- examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386-root.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386-root.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-i386-root.tar.gz

=== removed file 'examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386.tar.gz'
--- examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386.tar.gz	2013-03-20 17:58:13 +0000
+++ examples/foocloud/files/release-20121026.1/foovendor-6.1-server-cloudimg-i386.tar.gz	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fake-content: foovendor-6.1-server-cloudimg-i386.tar.gz

=== removed directory 'examples/foocloud/streams'
=== removed directory 'examples/foocloud/streams/v1'
=== removed file 'examples/foocloud/streams/v1/com.example.foovendor:released:aws.json'
--- examples/foocloud/streams/v1/com.example.foovendor:released:aws.json	2013-05-15 12:54:54 +0000
+++ examples/foocloud/streams/v1/com.example.foovendor:released:aws.json	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-{
- "datatype": "image-ids", 
- "updated": "Wed, 20 Mar 2013 17:56:57 +0000", 
- "content_id": "com.example.foovendor:released:aws", 
- "products": {
-  "com.example.foovendor:pinky:server:amd64": {
-   "endpoint": "https://ec2.us-east-1.amazonaws.com", 
-   "stream": "released", 
-   "versions": {
-    "20121026.1": {
-     "items": {
-      "usee1pe": {
-       "name": "ebs/foovendor-pinky-12.04-amd64-server-20121026.1", 
-       "root_store": "ebs", 
-       "id": "ami-e720ad8e"
-      }, 
-      "usee1pi": {
-       "name": "foovendor-pinky-12.04-amd64-server-20121026.1", 
-       "root_store": "instance-store", 
-       "id": "ami-1f24a976"
-      }
-     }, 
-     "label": "release"
-    }, 
-    "20120929": {
-     "items": {
-      "usee1pe": {
-       "name": "ebs/foovendor-pinky-12.04-amd64-server-20120929", 
-       "root_store": "ebs", 
-       "id": "ami-3b4ff252"
-      }, 
-      "usee1pi": {
-       "name": "foovendor-pinky-12.04-amd64-server-20120929", 
-       "root_store": "instance-store", 
-       "id": "ami-cd4cf1a4"
-      }
-     }, 
-     "label": "beta2"
-    }, 
-    "20121001": {
-     "items": {
-      "usee1pe": {
-       "name": "ebs/foovendor-pinky-12.04-amd64-server-20121001", 
-       "root_store": "ebs", 
-       "id": "ami-9878c0f1"
-      }, 
-      "usee1pi": {
-       "name": "foovendor-pinky-12.04-amd64-server-20121001", 
-       "root_store": "instance-store", 
-       "id": "ami-52863e3b"
-      }
-     }, 
-     "label": "release"
-    }
-   }, 
-   "virt_type": "paravirtual", 
-   "region": "us-east-1", 
-   "version": "6.1", 
-   "build": "server", 
-   "release": "pinky", 
-   "arch": "amd64"
-  }, 
-  "com.example.foovendor:pinky:server:i386": {
-   "endpoint": "https://ec2.us-east-1.amazonaws.com", 
-   "stream": "released", 
-   "versions": {
-    "20121026.1": {
-     "items": {
-      "usee1pe": {
-       "name": "ebs/foovendor-pinky-12.04-i386-server-20121026.1", 
-       "root_store": "ebs", 
-       "id": "ami-e720ad8e"
-      }, 
-      "usee1pi": {
-       "name": "foovendor-pinky-12.04-i386-server-20121026.1", 
-       "root_store": "instance-store", 
-       "id": "ami-1f24a976"
-      }
-     }, 
-     "label": "release"
-    }, 
-    "20120929": {
-     "items": {
-      "usee1pe": {
-       "name": "ebs/foovendor-pinky-12.04-i386-server-20120929", 
-       "root_store": "ebs", 
-       "id": "ami-3b4ff252"
-      }, 
-      "usee1pi": {
-       "name": "foovendor-pinky-12.04-i386-server-20120929", 
-       "root_store": "instance-store", 
-       "id": "ami-cd4cf1a4"
-      }
-     }, 
-     "label": "beta2"
-    }, 
-    "20121001": {
-     "items": {
-      "usee1pe": {
-       "name": "ebs/foovendor-pinky-12.04-i386-server-20121001", 
-       "root_store": "ebs", 
-       "id": "ami-9878c0f1"
-      }, 
-      "usee1pi": {
-       "name": "foovendor-pinky-12.04-i386-server-20121001", 
-       "root_store": "instance-store", 
-       "id": "ami-52863e3b"
-      }
-     }, 
-     "label": "release"
-    }
-   }, 
-   "virt_type": "paravirtual", 
-   "region": "us-east-1", 
-   "version": "6.1", 
-   "build": "server", 
-   "release": "pinky", 
-   "arch": "i386"
-  }
- }, 
- "format": "products:1.0"
-}

=== removed file 'examples/foocloud/streams/v1/com.example.foovendor:released:download.json'
--- examples/foocloud/streams/v1/com.example.foovendor:released:download.json	2015-09-18 13:41:23 +0000
+++ examples/foocloud/streams/v1/com.example.foovendor:released:download.json	1970-01-01 00:00:00 +0000
@@ -1,208 +0,0 @@
-{
- "datatype": "image-downloads", 
- "updated": "Wed, 20 Mar 2013 17:56:57 +0000", 
- "content_id": "com.example.foovendor:released:download", 
- "products": {
-  "com.example.foovendor:pinky:server:amd64": {
-   "version": "6.1", 
-   "build": "server", 
-   "stream": "released", 
-   "versions": {
-    "20121026.1": {
-     "items": {
-      "tar.gz": {
-       "name": "foovendor-pinky-6.1-amd64-server-20121026.1.tar.gz", 
-       "path": "files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64.tar.gz", 
-       "md5": "187ea3b68f9080d4c447b910c8d0838e",
-       "size": 57,
-       "ftype": "tar.gz"
-      }, 
-      "disk1.img": {
-       "name": "foovendor-pinky-6.1-amd64-server-20121026.1-disk1.img", 
-       "path": "files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64-disk1.img", 
-       "md5": "da499b246265a34db8576983371c6c2a",
-       "size": 60,
-       "ftype": "disk1.img"
-      }, 
-      "root.tar.gz": {
-       "name": "foovendor-pinky-6.1-amd64-server-20121026.1-root.tar.gz", 
-       "path": "files/release-20121026.1/foovendor-6.1-server-cloudimg-amd64-root.tar.gz", 
-       "md5": "da939f41059a1b1eca16c0c5856f47cd",
-       "size": 62,
-       "ftype": "root.tar.gz"
-      }
-     }, 
-     "label": "release"
-    }, 
-    "20120328": {
-     "items": {
-      "tar.gz": {
-       "name": "foovendor-pinky-6.1-beta2-amd64-server-20120328.tar.gz", 
-       "path": "files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64.tar.gz", 
-       "md5": "c245123c1a7c16dd43962b71c604c5ee",
-       "size": 63,
-       "ftype": "tar.gz"
-      }, 
-      "disk1.img": {
-       "name": "foovendor-pinky-6.1-beta2-amd64-server-20120328-disk1.img", 
-       "path": "files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64-disk1.img", 
-       "md5": "34cec541a18352783e736ba280a12201",
-       "size": 66,
-       "ftype": "disk1.img"
-      }, 
-      "root.tar.gz": {
-       "name": "foovendor-pinky-6.1-beta2-amd64-server-20120328-root.tar.gz", 
-       "path": "files/beta-2/foovendor-6.1-beta2-server-cloudimg-amd64-root.tar.gz", 
-       "md5": "55686ef088f7baf0ebea9349055daa85",
-       "size": 68,
-       "ftype": "root.tar.gz"
-      }
-     }, 
-     "label": "beta2"
-    }, 
-    "20121001": {
-     "items": {
-      "tar.gz": {
-       "name": "foovendor-pinky-6.1-amd64-server-20121001.tar.gz", 
-       "path": "files/release-20121001/foovendor-6.1-server-cloudimg-amd64.tar.gz", 
-       "md5": "187ea3b68f9080d4c447b910c8d0838e",
-       "size": 57,
-       "ftype": "tar.gz"
-      }, 
-      "disk1.img": {
-       "name": "foovendor-pinky-6.1-amd64-server-20121001-disk1.img", 
-       "path": "files/release-20121001/foovendor-6.1-server-cloudimg-amd64-disk1.img", 
-       "md5": "da499b246265a34db8576983371c6c2a",
-       "size": 60,
-       "ftype": "disk1.img"
-      }, 
-      "root.tar.gz": {
-       "name": "foovendor-pinky-6.1-amd64-server-20121001-root.tar.gz", 
-       "path": "files/release-20121001/foovendor-6.1-server-cloudimg-amd64-root.tar.gz", 
-       "md5": "da939f41059a1b1eca16c0c5856f47cd",
-       "size": 62,
-       "ftype": "root.tar.gz"
-      }
-     }, 
-     "label": "release"
-    }
-   }, 
-   "release": "pinky", 
-   "arch": "amd64"
-  }, 
-  "com.example.foovendor:pinky:server:i386": {
-   "version": "6.1", 
-   "build": "server", 
-   "stream": "released", 
-   "versions": {
-    "20121026.1": {
-     "items": {
-      "tar.gz": {
-       "name": "foovendor-pinky-6.1-i386-server-20121026.1.tar.gz", 
-       "path": "files/release-20121026.1/foovendor-6.1-server-cloudimg-i386.tar.gz", 
-       "md5": "1534e487730c8162131dde430aa5fa5a",
-       "size": 56,
-       "ftype": "tar.gz"
-      }, 
-      "disk1.img": {
-       "name": "foovendor-pinky-6.1-i386-server-20121026.1-disk1.img", 
-       "path": "files/release-20121026.1/foovendor-6.1-server-cloudimg-i386-disk1.img", 
-       "md5": "d8fa9a536e8cf1bebcee1e26875060bb",
-       "size": 59,
-       "ftype": "disk1.img"
-      }, 
-      "root.tar.gz": {
-       "name": "foovendor-pinky-6.1-i386-server-20121026.1-root.tar.gz", 
-       "path": "files/release-20121026.1/foovendor-6.1-server-cloudimg-i386-root.tar.gz", 
-       "md5": "de2b46e0fe2ce8c6eda2b4cd809505a9",
-       "size": 61,
-       "ftype": "root.tar.gz"
-      }
-     }, 
-     "label": "release"
-    }, 
-    "20120328": {
-     "items": {
-      "tar.gz": {
-       "name": "foovendor-pinky-6.1-beta2-i386-server-20120328.tar.gz", 
-       "path": "files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386.tar.gz", 
-       "md5": "2cd18b60f892af68c9d49c64ce1638e4",
-       "size": 62,
-       "ftype": "tar.gz"
-      }, 
-      "disk1.img": {
-       "name": "foovendor-pinky-6.1-beta2-i386-server-20120328-disk1.img", 
-       "path": "files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386-disk1.img", 
-       "md5": "e80df7995beb31571e104947e4d7b001",
-       "size": 65,
-       "ftype": "disk1.img"
-      }, 
-      "root.tar.gz": {
-       "name": "foovendor-pinky-6.1-beta2-i386-server-20120328-root.tar.gz", 
-       "path": "files/beta-2/foovendor-6.1-beta2-server-cloudimg-i386-root.tar.gz", 
-       "md5": "5d86b3e75e56e10e1019fe1153fe488f",
-       "size": 67,
-       "ftype": "root.tar.gz"
-      }
-     }, 
-     "label": "beta2"
-    }, 
-    "20121001": {
-     "items": {
-      "tar.gz": {
-       "name": "foovendor-pinky-6.1-i386-server-20121001.tar.gz", 
-       "path": "files/release-20121001/foovendor-6.1-server-cloudimg-i386.tar.gz",
-       "md5": "1534e487730c8162131dde430aa5fa5a",
-       "size": 56,
-       "ftype": "tar.gz"
-      }, 
-      "disk1.img": {
-       "name": "foovendor-pinky-6.1-i386-server-20121001-disk1.img", 
-       "path": "files/release-20121001/foovendor-6.1-server-cloudimg-i386-disk1.img", 
-       "md5": "d8fa9a536e8cf1bebcee1e26875060bb",
-       "size": 59,
-       "ftype": "disk1.img"
-      }, 
-      "root.tar.gz": {
-       "name": "foovendor-pinky-6.1-i386-server-20121001-root.tar.gz", 
-       "path": "files/release-20121001/foovendor-6.1-server-cloudimg-i386-root.tar.gz", 
-       "md5": "de2b46e0fe2ce8c6eda2b4cd809505a9",
-       "size": 61,
-       "ftype": "root.tar.gz"
-      }
-     }, 
-     "label": "release"
-    },
-    "samepaths": {
-     "items": {
-      "tar.gz": {
-       "name": "foovendor-pinky-6.1-i386-server-20121001.tar.gz", 
-       "path": "files/release-20121001/foovendor-6.1-server-cloudimg-i386.tar.gz",
-       "md5": "1534e487730c8162131dde430aa5fa5a",
-       "size": 56,
-       "ftype": "tar.gz"
-      }, 
-      "disk1.img": {
-       "name": "foovendor-pinky-6.1-i386-server-20121001-disk1.img", 
-       "path": "files/release-20121001/foovendor-6.1-server-cloudimg-i386-disk1.img", 
-       "md5": "d8fa9a536e8cf1bebcee1e26875060bb",
-       "size": 59,
-       "ftype": "disk1.img"
-      }, 
-      "root.tar.gz": {
-       "name": "foovendor-pinky-6.1-i386-server-20121001-root.tar.gz", 
-       "path": "files/release-20121001/foovendor-6.1-server-cloudimg-i386-root.tar.gz", 
-       "md5": "de2b46e0fe2ce8c6eda2b4cd809505a9",
-       "size": 61,
-       "ftype": "root.tar.gz"
-      }
-     }, 
-     "label": "release"
-    }
-   },
-   "release": "pinky", 
-   "arch": "i386"
-  }
- }, 
- "format": "products:1.0"
-}

=== removed file 'examples/foocloud/streams/v1/index.json'
--- examples/foocloud/streams/v1/index.json	2013-05-15 12:54:54 +0000
+++ examples/foocloud/streams/v1/index.json	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-{
- "index": {
-  "com.example.foovendor:released:aws": {
-   "datatype": "image-ids", 
-   "path": "streams/v1/com.example.foovendor:released:aws.json", 
-   "updated": "Wed, 20 Mar 2013 17:56:57 +0000", 
-   "products": [
-    "com.example.foovendor:pinky:server:amd64", 
-    "com.example.foovendor:pinky:server:i386"
-   ], 
-   "format": "products:1.0"
-  }, 
-  "com.example.foovendor:released:download": {
-   "datatype": "image-downloads", 
-   "path": "streams/v1/com.example.foovendor:released:download.json", 
-   "updated": "Wed, 20 Mar 2013 17:56:57 +0000", 
-   "products": [
-    "com.example.foovendor:pinky:server:amd64", 
-    "com.example.foovendor:pinky:server:i386"
-   ], 
-   "format": "products:1.0"
-  }
- }, 
- "updated": "Wed, 20 Mar 2013 17:56:57 +0000", 
- "format": "index:1.0"
-}

=== removed directory 'examples/keys'
=== removed file 'examples/keys/README.txt'
--- examples/keys/README.txt	2014-06-17 19:23:23 +0000
+++ examples/keys/README.txt	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-example.sec, example.pub:
-  These are example gpg public and private keys.
-  They are generated by tools/gen-example-key.
-
-  You should be sure to *not* trust anything simply because it is signed
-  with these keys.
-
-cloud-images.pub:
-  pub  4096R/476CF100 2012-10-27 Ubuntu Cloud Image Builder
-  sub  4096R/9D817405 2012-10-27
-
-  This is the public key for the entity that signs data on
-  cloud-images.ubuntu.com data.
-
-cirros.pub:
-  pub  4096R/8F4CE6D0 2013-02-26 Cirros Signing Key <[e-mail]>
-  sub  4096R/0B2CED65 2013-02-26
-  sub  4096R/A5DDB840 2013-02-26 [expires: 2020-02-25]
-
-  This is the public key for the entity that signs simplestream
-  data for http://download.cirros-cloud.net/ .

=== removed file 'examples/keys/cirros.pub'
--- examples/keys/cirros.pub	2013-04-08 19:56:16 +0000
+++ examples/keys/cirros.pub	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQINBFEsA6QBEACyuJn4L+OaplLC8+W0cQw7Qqothe2bKArhXOYBwjiu231OCacd
-k8B1ebvCcpNXYQ6KyAE7tDuaU0bxUNcgDKkpBDxH99nys4DHIovUgDOJS01G4RAI
-Qagy5FtpEDrU1eJ41x5RP1GEA/waOxYvLnjbG7tAm3bpPpQhHldeD/ByYKset35P
-he6b0kggUZM8ca9HDUty4I4yWPxyb2pSWLCHnM0oN05sFOig2o6X47dz8FYLtfiT
-Ab1bLlhthVwc0vrYll7YFAoGKPwwFDA+ANuOSKcfHgR9gJtzWXODvAK0gYVsSWOh
-0G2EVEufeohws1oS2tED3BCH1wyCYqLCxD2IQM1EShKUVhY81mQc4sdyoz1uurbO
-gu9tPN7fCp6PRmS83q+Ic2m521dcykeWA/qkYksYIwwcfXnkZOs2XouXIv3lDKT0
-rq+bS9qf87dyGAV3Jgat5IbK3nWzN+iOGu+q3X5XVWZxImK25MqHLRrxR3/n4Rkk
-jQsa3dOk/o2Adj70gGyONKDH9/UTaBB6fEKBbUZyCW82K2HcZeuhCzYxV1BR5iQ/
-1Jlk53tNac5gjIR2IzBu6r4zW+KWCnnE1AtNkJM4fe0ggsGvcV1j5VNSeL8XZOjn
-4UCOXtgJ/rYkxaCcqCJNHzrDJCYltlUq7Tdx2FZlp+Z9RDhS4GoZBKnZHQARAQAB
-tC1DaXJyb3MgU2lnbmluZyBLZXkgPHNpZ25pbmdAY2lycm9zLWNsb3VkLm5ldD6J
-AjgEEwECACIFAlEsA6QCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEJWT
-hISPTObQ+ooP/12NlKbc3EwG+37w9xR1/n05pUh1x0j0P++QEO8AFNiFhrt6gtoz
-z50LpCYaqINuNDrY+7rXLKh5IWlNSxKnI/H06sTZaOsYtYshv9MlIZW8aJrtFuAv
-HVLqDbHs4TnzAD0DL8GioepPjg424g9ocnh+J/A/sFEUw6zY+Q4kYeF+6kWWKovT
-fWsb966fNRQmAclg4JkpJjyB+cRUbj8MAvP8ZMhvPDAs575kC7kOlk1isF1mZb6z
-MVKybFzq4kg/s2Xgq8l3jBtx4BVGKXR8evTaJh9ABqN893yK+jpicAzeya9Yqshv
-GoQkgk6X5xzcUQ3feGtM/zThUKQ4KA2tifoEDPQYKI2jHiHrf+SUsJQlAXo/VIC4
-PFkUxyTKxnti3elwmj3WVGTuU87lfsdvbg0OM9FpfYhDVi1wYpjoFux3XRjHTrdy
-ll6iWzhpcDPGsV8jqqXqIphoU2sEHwMZC/GwII87AFsRRiItUX9lTAMrKNzxunVe
-YWTt1no1A/te5IsQK6hA31K9L0M30h0AC4vJvHpiwDl1PUfrAdyCDtcS++eT9jdK
-NccMpyYmE5ZORR9xkOsfiTMNN8aP2fW2t/wB5rBOacTLVCZnu6FZ+rbB522G8vOa
-yO4sBogj5H9SijrsUJq1W4CkGtFmMEEeCLjjwuhOd5bauTPrxb8G16/RuQINBFEs
-A6QBEADEk7k2S2P2VH6l2HFUz5BaVnFtcGSMT8xQki2gGXt5bl67czs3Ej2vSVWa
-D0lZzYxDixobwuih2ox5g9upez8SZKx6mxuLUDU493sWOTF+8uVH5h5ig+3+TOBx
-U5uFks7xJpuihxmAwxslJUpoQyUA8a2WzzsXGUGKdnh/lTmm8h/XeUWuAu6Ht6ed
-zgzgFaleG3BROaMVO5DWsHp3EZAq3HjEpCo6dFBV/A5b9ZQb6jIVpTInLFb6OoIh
-W1w1UYIFkcsRf51Oek6W6TB9lkp5raNH3/Irg3M0zsK5i4Zaq15EdgqliH0XhpLC
-1MJNLEJU6gP5Yr9GiWgRdWFmVykxG2AacHxH/hFPWZC32L4y4GX7WeAzJJg2k6Uz
-5qz/DgJFa1/vfZW/0Df6TJAnSp4W12tesxgLghdwCzLdogEKqBoWLwoFhnNBe+5h
-xpP8eO+nOvwfZeB1mXhVKcq0LNLrKGOediakxhrUlHUtrRDHcRSjzD1tRZO8EsCc
-C2jcJjeVZ/ReH/Q/F7P3gQ3QoQzLkY0EZ+FO1z5g8T5C3KOyB7r8dHD2I2J29SOX
-i+pFcSpHYw6mZXC4CvxrzpugxvvvmemZFc/Lw99NomFZZoXIUK5qhma+tMdyRQ88
-MakkIll951X5U7LLtrKW5wWOSunXSYRpNSLbqCsfC/7u3NiUAwARAQABiQIfBBgB
-AgAJBQJRLAOkAhsMAAoJEJWThISPTObQ/YgQAI/l1puhMa/+THkHH9j9RaEHA3cR
-MVgp33QR6zA30+Rl2iFWSZjmSLOVXtlTRe2vIng9Gj5f+Oi24pdQcl6qu6UZ/89l
-8X7l3pt1zOeGyliK2blCKXdBLR0tlHb+twCI5fPZ+K5NGPtMYS8zbAnrKKfWfuOr
-04iiV3rJ5j4MHwGbu63HpgzwHQOQYcFWuqBk/bjPFwudt5+u/FVNAdstDkDDk9dF
-W4DUFv0Yd2q1aI3/pF1HqzzmrP/1mFA7RoyiT/csihpp0WWlazN7+fTsNd6cikN5
-hJtzEKD66abjLB2S3IYIgbJHKR1XylYTnFQG9fxlCR4W3xB27XaXAoGOni1DwAIT
-3yUoAMWCxuXcMd5oqwQDNArc1VyRedhrQPQM4jF5vRljoLV2kkZ6WkDFNQBzB3I5
-mD8NRGmkWgFGvyj6hhNgIwWijOBIG4FbwLT/HUDhiS0uoIG0lL6qGa5V+j9jnWaM
-M77OG9U/z+SHuC0AL/DpKDvj0Xii+qpXeIiHQxA0XQMWTgnQozfKeBQLsKN0RMHb
-IBzQg9qvws2gOtORniO7UMfv+U4rL9AQSMEan/Tohk6ZmUisHvi4vtWNsAxqNjXJ
-7dqmmy8SBwkI/+eirT2Q9+vRGHqMC1Z7JDMGPSMGARRks9xKRln0FdPTyxTmObOQ
-26TVo7HvWs+vVZDbuQINBFEsBg4BEADO6FgdZBI5PwpDvTplDVm10cQo7N9mcCJn
-eRcrj4VQ89OTfSmJH3Qpf6JkG/UGS/kO6vIDF5b2SzRPAYT1QM3lVYhixU1gVPv1
-mp4zHOJse5thnaD7HlpvM/VBnN8h+qAo6YSYhlmYc9FqLSmZRoNE2+WGp/6G/5iB
-r2lOs1Iii1HW2XYgl9Rw/HnwHjXAaZiCCt0EXvLoutw3KvIirHHfkVEsX8p1dloR
-HCSu40l2t29e1ujkl/LWb1UkBv9a/OrrQEVqpDfnO/ai/PJ8KSEMUYnB9eIhM5J4
-OvhiaKVJI5uJVsMRFm8NUCmguVB1eXeQ1ndvWn1CeKJeyKO04BFR2ZwMVq9Pdcbe
-Ga8Rz8poHI/dsut/EPPZdOnTr3LbqH+f0f+P+UsRMLXuV8O4tKZu4mrl9XEdb3yJ
-18atOL2bHNvAHXXN45UXCLU6j1qWolO9yOuBNw6fPbsagK3kfvo6SBlAp1LcHjHd
-OKVWM3cqUll7/xo3cBiIvMRTvZlzGSAssGWe0kt9O/0a5pPJRxyj8G1HGZ8BzDZz
-JpPD9dcU/NFD5qB+gZjGrJqycdgw79JMyUCHRZpzeRDDZb0AN+NFiVqgQFnhMLek
-UkILyJnVnLHaSM0vh0/++P3O6lqsQ99AKaFm1pNZCUMNF9ZU0i8/if8VKhu7Hly0
-dbjDMsjWMQARAQABiQREBBgBAgAPBQJRLAYOAhsCBQkNKGiAAikJEJWThISPTObQ
-wV0gBBkBAgAGBQJRLAYOAAoJEGRyWpml3bhA+SQQAMegxIPVOb7TnOzf5VazTa0a
-sC+PuEWDNIz2jns2TfNHhRQx+Eb5BXQKW0OwXxyAv4+TgA2WTpWueCzEtnfXdIxH
-rnjp96MLUOB/j1jIzAJADGVjcEc1kO6VVF61ba3D7ST2Z7YTQ07krsZiGD78UlxF
-zoOHBkiQTIkXjIAFOu0/TqlwN4JBNRr61GtMHyI5awwgB0RParT0Vfkki3NlR2T/
-bym02l2uIlGLsq0owiRdY5H9RoOyMdhKC72CSBv5UyeAqk9P5B99OyWHoQ7WZTWO
-aRHkWpXaql4wWyzdoQdtJH5J5XN9/5RFUxlltcXRy/+grJUrlpd886hN8vrrg3eB
-fOyts/K2JIk99WBMRf4BxwyFA9wWvoGoozFVjSzBFtluOqPtSWRHgzm5cqdZTCVT
-TcSxgYkCdPlHClxv78aVi9MmEEk5TIWSHb/jjE5Lv0vOPCgdmRlhAVC7ghFj+BO1
-5a5Um3TS5StZskOrAQtzg2Y7asWET9fsaWXCS/iom5saekmkbBXO4EwiQKlkoFWU
-8oGSWFcIc4LnJ467QHDMGMBFq4AQfOLgi9+G1HiphXdJrDesBXV755/mBZfiIKOM
-W2QLoCWi065FTRD3V7y0V5dpKjt6wVkNrVozeF0rWivErVu/r8H6Aee2L0VCPB6j
-NF73z67E9Dzj4QT3LtoaWZgQAI445UYbBD/SdwtbYWTwlRkJY88isJGA2nPpDMfq
-PR9JlBHoCCBf0IrsXoLXuFoCFlviROqOCsfvJ6R7bsZmmWwqWvBqENvrW8rwJTVB
-XcSj23TNLaqQ/kef8JDuscVn7tDwb7dCIye0fG/eZskTsMJ9Osgt9I6S5Fz0yFHv
-7xJlXjEwkxYXdyGoXEW3MbQuM7Y3LHSm8Y/M6boo9OMyrdK1XObiqhgYUoBzbD0y
-nBdxQvr18wNLoM1KysvOs0yvBHhMRZXyt3pdTFCzLBYl5C94267DhiL9EJ3x8qMG
-E7Yqgu9sjHrgGy/rZUlGj/l2uzd6pYzlcyaABKLO9T0H1Y2Xpx/+d9GGyy0DHVdO
-FYORNtZIi3Gc5mKlL38P8eL4AAoPLp5nasy9Y3aAAKOBR2YW/BhnEpMjRndOvoxy
-NCQgPZxyAKKnzCFyLvlbRN0AYhOWQDjXFHbc+RZsrJcgAR6XS9PwBe6yW1sh888c
-dCSi9/XNyKJX9IR8ucdInZUAc4qrfi9zCt//4ZoHeW48OS7OgnoA3Y6RZR+UbSQE
-6aBTt6z5e6SyaKRx7OlcqK3G19KmEuFzH18THtPD1s+kiUMHKXouooUoLbMEvW8P
-oKte55W4stewkhS8DZV5IkvYZzPMQ8ks6GMdzHiNVkEujUkUNsEualm5Q8hEzPBA
-8dxY
-=NgGK
------END PGP PUBLIC KEY BLOCK-----

=== removed file 'examples/keys/cloud-images.pub'
--- examples/keys/cloud-images.pub	2013-03-22 16:51:38 +0000
+++ examples/keys/cloud-images.pub	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQINBFCMc9EBEADDKn9mOi9VZhW+0cxmu3aFZWMg0p7NEKuIokkEdd6P+BRITccO
-ddDLaBuuamMbt/V1vrxWC5J+UXe33TwgO6KGfH+ECnXD5gYdEOyjVKkUyIzYV5RV
-U5BMrxTukHuh+PkcMVUy5vossCk9MivtCRIqM6eRqfeXv6IBV9MFkAbG3x96ZNI/
-TqaWTlaHGszz2Axf9JccHCNfb3muLI2uVnUaojtDiZPm9SHTn6O0p7Tz7M7+P8qy
-vc6bdn5FYAk+Wbo+zejYVBG/HLLE4+fNZPESGVCWZtbZODBPxppTnNVm3E84CTFt
-pmWFBvBE/q2G9e8s5/mP2ATrzLdUKMxr3vcbNX+NY1Uyvn0Z02PjbxThiz1G+4qh
-6Ct7gprtwXPOB/bCITZL9YLrchwXiNgLLKcGF0XjlpD1hfELGi0aPZaHFLAa6qq8
-Ro9WSJljY/Z0g3woj6sXpM9TdWe/zaWhxBGmteJl33WBV7a1GucN0zF1dHIvev4F
-krp13Uej3bMWLKUWCmZ01OHStLASshTqVxIBj2rgsxIcqH66DKTSdZWyBQtgm/kC
-qBvuoQLFfUgIlGZihTQ96YZXqn+VfBiFbpnh1vLt24CfnVdKmzibp48KkhfqduDE
-Xxx/f/uZENH7t8xCuNd3p+u1zemGNnxuO8jxS6Ico3bvnJaG4DAl48vaBQARAQAB
-tG9VYnVudHUgQ2xvdWQgSW1hZ2UgQnVpbGRlciAoQ2Fub25pY2FsIEludGVybmFs
-IENsb3VkIEltYWdlIEJ1aWxkZXIpIDx1YnVudHUtY2xvdWRidWlsZGVyLW5vcmVw
-bHlAY2Fub25pY2FsLmNvbT6JAjgEEwECACIFAlCMc9ECGwMGCwkIBwMCBhUIAgkK
-CwQWAgMBAh4BAheAAAoJEH/z9AhHbPEAvRIQAMLE4ZMYiLvwSoWPAicM+3FInaqP
-2rf1ZEf1k6175/G2n8cG3vK0nIFQE9Cus+ty2LrTggm79onV2KBGGScKe3ga+meO
-txj601Wd7zde10IWUa1wlTxPXBxLo6tpF4s4aw6xWOf4OFqYfPU4esKblFYn1eMK
-Dd53s3/123u8BZqzFC8WSMokY6WgBa+hvr5J3qaNT95UXo1tkMf65ZXievcQJ+Hr
-bp1m5pslHgd5PqzlultNWePwzqmHXXf14zI1QKtbc4UjXPQ+a59ulZLVdcpvmbjx
-HdZfK0NJpQX+j5PU6bMuQ3QTMscuvrH4W41/zcZPFaPkdJE5+VcYDL17DBFVzknJ
-eC1uzNHxRqSMRQy9fzOuZ72ARojvL3+cyPR1qrqSCceX1/Kp838P2/CbeNvJxadt
-liwI6rzUgK7mq1Bw5LTyBo3mLwzRJ0+eJHevNpxl6VoFyuoA3rCeoyE4on3oah1G
-iAJt576xXMDoa1Gdj3YtnZItEaX3jb9ZB3iz9WkzZWlZsssdyZMNmpYV30Ayj3CE
-KyurYF9lzIQWyYsNPBoXORNh73jkHJmL6g1sdMaxAZeQqKqznXbuhBbt8lkbEHMJ
-Stxc2IGZaNpQ+/3LCwbwCphVnSMq+xl3iLg6c0s4uRn6FGX+8aknmc/fepvRe+ba
-ntqvgz+SMPKrjeevuQINBFCMc9EBEADKGFPKBL7/pMSTKf5YH1zhFH2lr7tf5hbz
-ztsx6j3y+nODiaQumdG+TPMbrFlgRlJ6Ah1FTuJZqdPYObGSQ7qd/VvvYZGnDYJv
-Z1kPkNDmCJrWJs+6PwNARvyLw2bMtjCIOAq/k8wByKkMzegobJgWsbr2Jb5fT4cv
-FxYpm3l0QxQSw49rriO5HmwyiyG1ncvaFUcpxXJY8A2s7qX1jmjsqDY1fWsv5PaN
-ue0Fr3VXfOi9p+0CfaPY0Pl4GHzat/D+wLwnOhnjl3hFtfbhY5bPl5+cD51SbOnh
-2nFv+bUK5HxiZlz0bw8hTUBN3oSbAC+2zViRD/9GaBYY1QjimOuAfpO1GZmqohVI
-msZKxHNIIsk5H98mN2+LB3vH+B6zrSMDm3d2Hi7ZA8wH26mLIKLbVkh7hr8RGQjf
-UZRxeQEf+f8F3KVoSqmfXGJfBMUtGQMTkaIeEFpMobVeHZZ3wk+Wj3dCMZ6bbt2i
-QBaoa7SU5ZmRShJkPJzCG3SkqN+g9ZcbFMQsybl+wLN7UnZ2MbSk7JEy6SLsyuVi
-7EjLmqHmG2gkybisnTu3wjJezpG12oz//cuylOzjuPWUWowVQQiLs3oANzYdZ0Hp
-SuNjjtEILSRnN5FAeogs0AKH6sy3kKjxtlj764CIgn1hNidSr2Hyb4xbJ/1GE3Rk
-sjJi6uYIJwARAQABiQIfBBgBAgAJBQJQjHPRAhsMAAoJEH/z9AhHbPEA6IsP/3jJ
-DaowJcKOBhU2TXZglHM+ZRMauHRZavo+xAKmqgQc/izgtyMxsLwJQ+wcTEQT5uqE
-4DoWH2T7DGiHZd/89Qe6HuRExR4p7lQwUop7kdoabqm1wQfcqr+77Znp1+KkRDyS
-lWfbsh9ARU6krQGryODEOpXJdqdzTgYhdbVRxq6dUopz1Gf+XDreFgnqJ+okGve2
-fJGERKYynUmHxkFZJPWZg5ifeGVt+YY6vuOCg489dzx/CmULpjZeiOQmWyqUzqy2
-QJ70/sC8BJYCjsESId9yPmgdDoMFd+gf3jhjpuZ0JHTeUUw+ncf+1kRf7LAALPJp
-2PTSo7VXUwoEXDyUTM+dI02dIMcjTcY4yxvnpxRFFOtklvXt8Pwa9x/aCmJb9f0E
-5FO0nj7l9pRd2g7UCJWETFRfSW52iktvdtDrBCft9OytmTl492wAmgbbGeoRq3ze
-QtzkRx9cPiyNQokjXXF+SQcq586oEd8K/JUSFPdvth3IoKlfnXSQnt/hRKv71kbZ
-IXmR3B/q5x2Msr+NfUxyXfUnYOZ5KertdprUfbZjudjmQ78LOvqPF8TdtHg3gD2H
-+G2z+IoH7qsOsc7FaJsIIa4+dljwV3QZTE7JFmsas90bRcMuM4D37p3snOpHAHY3
-p7vH1ewg+vd9ySST0+OkWXYpbMOIARfBKyrGM3nu
-=+MFT
------END PGP PUBLIC KEY BLOCK-----

=== removed file 'examples/keys/example.pub'
--- examples/keys/example.pub	2013-02-26 04:47:24 +0000
+++ examples/keys/example.pub	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mI0EUSw66gEEAM6AjeB/KtvuLbkbn6F0Whew2sYx5O2j2smSgwJ0oevnlRzneyXh
-kUIR+wH5KBDIz5Ikp35ZrZFYoP++7VMALDTp9l+OOlrbz4rQzwI8HvXumkhT+BgE
-lfN10eu0rBkVNxqt9lXuMNYwgJJtfBPzXVBQju6QDYx5Uodxk9C9TXapABEBAAG0
-XFNpbXBsZSBTdHJlYW1zIFRlc3QgVXNlciAoVGVzdCBVc2FnZSBPbmx5LiBEbyBO
-b3QgSW1wb3J0LikgPHNpbXBsZXN0cmVhbXNAYm9ndXMuZXhhbXBsZS5jb20+iL4E
-EwECACgFAlEsOuoCGy8FCRLMAwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ
-EKlxSiA5Z1NuK0ID/R8iBwVt/9tqFy7eeJzCDK0O7QcpmhvKyjPLLmsUhysx8kC7
-S89yuWyr6iQcjAoAMK6EkOZgRoFfOIA+hZkFC0blFHLCrdSghSQQm6hL/XJuWtkf
-HBdu7yKudGzGyYmpGYYG69zz+he5EZUtY1fR9PSGSM+ZwCLznHdCJix7bNi0
-=HEJL
------END PGP PUBLIC KEY BLOCK-----

=== removed file 'examples/keys/example.sec'
--- examples/keys/example.sec	2013-02-26 04:47:24 +0000
+++ examples/keys/example.sec	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
------BEGIN PGP PRIVATE KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-lQHXBFEsOuoBBADOgI3gfyrb7i25G5+hdFoXsNrGMeTto9rJkoMCdKHr55Uc53sl
-4ZFCEfsB+SgQyM+SJKd+Wa2RWKD/vu1TACw06fZfjjpa28+K0M8CPB717ppIU/gY
-BJXzddHrtKwZFTcarfZV7jDWMICSbXwT811QUI7ukA2MeVKHcZPQvU12qQARAQAB
-AAP2KSNzIEY1Q5svgLEAHCoRyKZy7wkBklYSQBXwA404tMZt7lQvNFy7k24Bk2MP
-mEhpEbQ7qfAzo8EEUe63WNGv/H6yl37pcS2rKxGdar9/dFV2t/TbJaehKotIvG9D
-x1CvuT/7DQRj9rGWrDrhx2XIz8hpD21bxrDb2TEF5WjfAQIA05tN+7zxTXSKq7Wt
-215ba4kBhKKuvrYMN5m871O/cNJfVh9ABea4xRFOOTkcpXsHAl1JPV52wRlHpBoe
-b36goQIA+dMapApF9zYflJ5rp3RLCwH0YwmY55+MBL5OTN7PM6DFs61rQG1ZO3x8
-VJ1GNvpVhEuIBUmsD2O4BVYekDsxCQIAuqMgVMVDfj7P2MeMKZ888XphQuYeJdIq
-IckpdKnZSKSU0oXKiB9y0AyptB1Aih8IhF00EIURWjMI//19JkBXuJNetFxTaW1w
-bGUgU3RyZWFtcyBUZXN0IFVzZXIgKFRlc3QgVXNhZ2UgT25seS4gRG8gTm90IElt
-cG9ydC4pIDxzaW1wbGVzdHJlYW1zQGJvZ3VzLmV4YW1wbGUuY29tPoi+BBMBAgAo
-BQJRLDrqAhsvBQkSzAMABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCpcUog
-OWdTbitCA/0fIgcFbf/bahcu3nicwgytDu0HKZobysozyy5rFIcrMfJAu0vPcrls
-q+okHIwKADCuhJDmYEaBXziAPoWZBQtG5RRywq3UoIUkEJuoS/1yblrZHxwXbu8i
-rnRsxsmJqRmGBuvc8/oXuRGVLWNX0fT0hkjPmcAi85x3QiYse2zYtA==
-=svaP
------END PGP PRIVATE KEY BLOCK-----

=== removed directory 'examples/minimal'
=== removed directory 'examples/minimal/product1'
=== removed directory 'examples/minimal/product1/20150915'
=== removed file 'examples/minimal/product1/20150915/root.img'
--- examples/minimal/product1/20150915/root.img	2015-09-15 20:31:52 +0000
+++ examples/minimal/product1/20150915/root.img	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-content of product1/20150915/root.img

=== removed file 'examples/minimal/product1/20150915/text.txt'
--- examples/minimal/product1/20150915/text.txt	2015-09-15 20:31:52 +0000
+++ examples/minimal/product1/20150915/text.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-content of product1/20150915/text.txt

=== removed directory 'examples/minimal/streams'
=== removed directory 'examples/minimal/streams/v1'
=== removed file 'examples/minimal/streams/v1/download.json'
--- examples/minimal/streams/v1/download.json	2015-09-15 20:31:52 +0000
+++ examples/minimal/streams/v1/download.json	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-{
- "datatype": "image-downloads", 
- "format": "products:1.0",
- "updated": "Tue, 15 Sep 2015 16:15:24 -0400",
- "content_id": "com.example:download",
- "products": {
-  "com.example:product1": {
-   "versions": {
-    "20150915": {
-     "items": {
-      "item1": {
-       "ftype": "text",
-       "path": "product1/20150915/text.txt",
-       "sha256": "f4797060c79363d37129656e5069e817cfd144ba9a1db0a392eeba0c534316dd", 
-       "size": 38
-      },
-      "item2": {
-       "ftype": "root.img",
-       "path": "product1/20150915/root.img",
-       "sha256": "0e2f431f4e4063483708ce24448af8586e115c984e483d60bdb532194536ece4", 
-       "size": 38
-      }
-     }
-    }
-   }
-  }
- }
-}

=== removed file 'examples/minimal/streams/v1/index.json'
--- examples/minimal/streams/v1/index.json	2015-09-15 20:31:52 +0000
+++ examples/minimal/streams/v1/index.json	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-{
- "index": {
-  "com.example:download": {
-   "datatype": "image-downloads", 
-   "path": "streams/v1/download.json",
-   "updated": "Tue, 15 Sep 2015 16:15:24 -0400",
-   "products": [
-    "com.example:product1"
-   ], 
-   "format": "products:1.0"
-  } 
- }, 
- "updated": "Tue, 15 Sep 2015 16:15:24 -0400",
- "format": "index:1.0"
-}

=== removed file 'setup.py'
--- setup.py	2016-08-02 20:12:59 +0000
+++ setup.py	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-from distutils.core import setup
-from glob import glob
-import os
-
-VERSION = '0.1.0'
-
-
-def is_f(p):
-    return os.path.isfile(p)
-
-
-setup(
-    name="python-simplestreams",
-    description='Library and tools for using Simple Streams data',
-    version=VERSION,
-    author='Scott Moser',
-    author_email='[e-mail]',
-    license="AGPL",
-    url='http://launchpad.net/simplestreams/',
-    packages=['simplestreams', 'simplestreams.mirrors',
-              'simplestreams.objectstores'],
-    scripts=glob('bin/*'),
-    data_files=[
-        ('lib/simplestreams', glob('tools/hook-*')),
-        ('share/doc/simplestreams',
-         [f for f in glob('doc/*') if is_f(f)]),
-    ]
-)

=== modified file 'simplestreams/__init__.py'
--- simplestreams/__init__.py	2018-06-25 18:03:13 +0000
+++ simplestreams/__init__.py	2018-06-27 19:28:50 +0000
@@ -1,16 +1,10 @@
 import os
+import warnings
 
 _readme = os.path.join(os.path.dirname(__file__), "..", "README.txt")
 if os.path.exists(_readme):
-    from datetime import date
-    import warnings
     with open(_readme, "r") as fp:
         content = fp.read()
-    if (not os.environ.get("SIMPLESTREAMS_BZR") and
-            date.today() > date(2018, 7, 31)):
-        raise DeprecationWarning("\n" + content)
-    else:
-        warnings.showwarning("\n" + content, UserWarning,
-                             filename=None, lineno=None, line=False)
+    raise RuntimeError('\n' + content)
 
 # vi: ts=4 expandtab

=== removed file 'simplestreams/checksum_util.py'
--- simplestreams/checksum_util.py	2015-09-22 14:48:33 +0000
+++ simplestreams/checksum_util.py	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-#   Copyright (C) 2015 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
-import hashlib
-
-# these are in order of increasing preference
-CHECKSUMS = ("md5", "sha256", "sha512")
-
-try:
-    ALGORITHMS = list(getattr(hashlib, 'algorithms'))
-except AttributeError:
-    ALGORITHMS = list(hashlib.algorithms_available)
-
-
-class checksummer(object):
-    _hasher = None
-    algorithm = None
-    expected = None
-
-    def __init__(self, checksums):
-        if not checksums:
-            self._hasher = None
-            return
-
-        for meth in CHECKSUMS:
-            if meth in checksums and meth in ALGORITHMS:
-                self._hasher = hashlib.new(meth)
-                self.algorithm = meth
-
-        self.expected = checksums.get(self.algorithm, None)
-
-        if not self._hasher:
-            raise TypeError("Unable to find suitable hash algorithm")
-
-    def update(self, data):
-        if self._hasher is None:
-            return
-        self._hasher.update(data)
-
-    def hexdigest(self):
-        if self._hasher is None:
-            return None
-        return self._hasher.hexdigest()
-
-    def check(self):
-        return (self.expected is None or self.expected == self.hexdigest())
-
-    def __str__(self):
-        return ("checksummer (algorithm=%s expected=%s)" %
-                (self.algorithm, self.expected))
-
-
-def item_checksums(item):
-    return {k: item[k] for k in CHECKSUMS if k in item}
-
-
-class SafeCheckSummer(checksummer):
-    """SafeCheckSummer raises ValueError if checksums are not provided."""
-    def __init__(self, checksums, allowed=None):
-        if allowed is None:
-            allowed = CHECKSUMS
-        super(SafeCheckSummer, self).__init__(checksums)
-        if self.algorithm not in allowed:
-            raise ValueError(
-                "provided checksums (%s) did not include any allowed (%s)" %
-                (checksums, allowed))
-
-
-class InvalidChecksum(ValueError):
-    def __init__(self, path, cksum, size=None, expected_size=None, msg=None):
-        self.path = path
-        self.cksum = cksum
-        self.size = size
-        self.expected_size = expected_size
-        self.msg = msg
-
-    def __str__(self):
-        if self.msg is not None:
-            return self.msg
-        if not isinstance(self.expected_size, int):
-            msg = "Invalid size '%s' at %s." % (self.expected_size, self.path)
-        else:
-            msg = ("Invalid %s Checksum at %s. Found %s. Expected %s. "
-                   "read %s bytes expected %s bytes." %
-                   (self.cksum.algorithm, self.path,
-                    self.cksum.hexdigest(), self.cksum.expected,
-                    self.size, self.expected_size))
-            if self.size:
-                msg += (" (size %s expected %s)" %
-                        (self.size, self.expected_size))
-        return msg
-
-
-def invalid_checksum_for_reader(reader, msg=None):
-    return InvalidChecksum(path=reader.url, cksum=reader.checksummer,
-                           size=reader.bytes_read, expected_size=reader.size,
-                           msg=msg)

=== removed file 'simplestreams/contentsource.py'
--- simplestreams/contentsource.py	2017-10-24 13:33:34 +0000
+++ simplestreams/contentsource.py	1970-01-01 00:00:00 +0000
@@ -1,472 +0,0 @@
-#   Copyright (C) 2013 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
-
-import errno
-import io
-import os
-import sys
-
-from . import checksum_util
-
-if sys.version_info > (3, 0):
-    import urllib.parse as urlparse
-    import urllib.request as urllib_request
-    import urllib.error as urllib_error
-else:
-    import urlparse
-    import urllib2 as urllib_request
-    urllib_error = urllib_request
-
-READ_BUFFER_SIZE = 1024 * 10
-
-try:
-    # We try to use requests because we can do gzip encoding with it.
-    # however requests < 1.1 didn't have 'stream' argument to 'get'
-    # making it completely unsuitable for downloading large files.
-    import requests
-    from distutils.version import LooseVersion
-    import pkg_resources
-    _REQ = pkg_resources.get_distribution('requests')
-    _REQ_VER = LooseVersion(_REQ.version)
-    if _REQ_VER < LooseVersion('1.1'):
-        raise ImportError("Requests version < 1.1, not suitable for usage.")
-    URL_READER_CLASSNAME = "RequestsUrlReader"
-except ImportError:
-    URL_READER_CLASSNAME = "Urllib2UrlReader"
-    requests = None
-
-
-class ContentSource(object):
-    url = None
-
-    def open(self):
-        # open can be explicitly called to 'open', but might be implicitly
-        # called from read()
-        pass
-
-    def read(self, size=-1):
-        raise NotImplementedError()
-
-    def set_start_pos(self, offset):
-        """ Implemented if the ContentSource supports seeking within content.
-        Used to resume failed transfers. """
-
-        class SetStartPosNotImplementedError(NotImplementedError):
-            pass
-
-        raise SetStartPosNotImplementedError()
-
-    def __enter__(self):
-        self.open()
-        return self
-
-    def __exit__(self, etype, value, trace):
-        self.close()
-
-    def close(self):
-        raise NotImplementedError()
-
-
-class UrlContentSource(ContentSource):
-    fd = None
-
-    def __init__(self, url, mirrors=None, url_reader=None):
-        if mirrors is None:
-            mirrors = []
-        self.mirrors = mirrors
-        self.input_url = url
-        self.url = url
-        self.offset = None
-        self.fd = None
-        if url_reader is None:
-            self.url_reader = URL_READER
-        else:
-            self.url_reader = url_reader
-
-    def _urlinfo(self, url):
-        parsed = urlparse.urlparse(url)
-        if not parsed.scheme:
-            if url.startswith("/"):
-                url = "file://%s" % url
-            else:
-                url = "file://%s/%s" % (os.getcwd(), url)
-            parsed = urlparse.urlparse(url)
-
-        if parsed.scheme == "file":
-            return (url, FileReader, (parsed.path,))
-        else:
-            return (url, self.url_reader, (url,))
-
-    def _open(self):
-        for url in [self.input_url] + self.mirrors:
-            try:
-                (normurl, opener, oargs) = self._urlinfo(url)
-                self.url = normurl
-                return opener(*oargs, offset=self.offset)
-            except IOError as e:
-                if e.errno != errno.ENOENT:
-                    raise
-                continue
-        myerr = IOError("Unable to open %s. mirrors=%s" %
-                        (self.input_url, self.mirrors))
-        myerr.errno = errno.ENOENT
-        raise myerr
-
-    def open(self):
-        if self.fd is None:
-            self.fd = self._open()
-
-    def read(self, size=-1):
-        if self.fd is None:
-            self.open()
-        return self.fd.read(size)
-
-    def set_start_pos(self, offset):
-        if self.fd is not None:
-            raise Exception("can't set start pos after open()")
-        self.offset = offset
-
-    def close(self):
-        if self.fd:
-            self.fd.close()
-            self.fd = None
-
-
-class FdContentSource(ContentSource):
-    def __init__(self, fd, url=None):
-        self.fd = fd
-        self.url = url
-
-    def read(self, size=-1):
-        return self.fd.read(size)
-
-    def close(self):
-        self.fd.close()
-
-
-class IteratorContentSource(ContentSource):
-    def __init__(self, itgen, url=None):
-        self.itgen = itgen
-        self.url = url
-        self.r_iter = None
-        self.leftover = bytes()
-        self.consumed = False
-
-    def open(self):
-        if self.r_iter:
-            return
-
-        try:
-            self.r_iter = self.itgen()
-        except Exception as exc:
-            if self.is_enoent(exc):
-                enoent = IOError(exc)
-                enoent.errno = errno.ENOENT
-                raise enoent
-            raise exc
-
-    def is_enoent(self, exc):
-        return (isinstance(exc, IOError) and exc.errno == errno.ENOENT)
-
-    def read(self, size=None):
-        self.open()
-
-        if self.consumed:
-            return bytes()
-
-        if (size is None or size < 0):
-            # read everything
-            ret = self.leftover
-            self.leftover = bytes()
-            for buf in self.r_iter:
-                ret += buf
-            self.consumed = True
-            return ret
-
-        ret = bytes()
-
-        if self.leftover:
-            if len(self.leftover) > size:
-                ret = self.leftover[0:size]
-                self.leftover = self.leftover[size:]
-                return ret
-            ret = self.leftover
-            self.leftover = bytes()
-
-        while True:
-            try:
-                ret += next(self.r_iter)
-                if len(ret) >= size:
-                    self.leftover = ret[size:]
-                    ret = ret[0:size]
-                    break
-            except StopIteration:
-                self.consumed = True
-                break
-        return ret
-
-    def close(self):
-        pass
-
-
-class MemoryContentSource(FdContentSource):
-    def __init__(self, url=None, content=""):
-        if isinstance(content, str):
-            content = content.encode('utf-8')
-        fd = io.BytesIO(content)
-        if url is None:
-            url = "MemoryContentSource://undefined"
-        super(MemoryContentSource, self).__init__(fd=fd, url=url)
-
-
-class ChecksummingContentSource(ContentSource):
-    def __init__(self, csrc, checksums, size=None):
-        self.cs = csrc
-        self.bytes_read = 0
-        self.checksummer = None
-        self.size = size
-
-        try:
-            csummer = checksum_util.SafeCheckSummer(checksums)
-        except ValueError as e:
-            raise checksum_util.invalid_checksum_for_reader(self, msg=str(e))
-
-        self._set_checksummer(csummer)
-
-        try:
-            self.size = int(size)
-        except TypeError:
-            self.size = size
-            raise checksum_util.invalid_checksum_for_reader(self)
-
-    def resume(self, offset, checksummer):
-        self.cs.set_start_pos(offset)
-        self._set_checksummer(checksummer)
-        self.bytes_read = offset
-
-    @property
-    def algorithm(self):
-        return self.checksummer.algorithm
-
-    def _set_checksummer(self, checksummer):
-        if checksummer.algorithm not in checksum_util.CHECKSUMS:
-            raise ValueError("algorithm %s is not valid (%s)" %
-                             (checksummer.algorithm, checksum_util.CHECKSUMS))
-        self.checksummer = checksummer
-
-    def check(self):
-        return self.bytes_read == self.size and self.checksummer.check()
-
-    def read(self, size=-1):
-        buf = self.cs.read(size)
-        buflen = len(buf)
-        self.checksummer.update(buf)
-        self.bytes_read += buflen
-
-        # read size was different size than expected.
-        # if its not the end, something wrong
-        if buflen != size and self.size != self.bytes_read:
-            raise checksum_util.invalid_checksum_for_reader(self)
-
-        if self.bytes_read == self.size and not self.check():
-            raise checksum_util.invalid_checksum_for_reader(self)
-        return buf
-
-    def open(self):
-        return self.cs.open()
-
-    def close(self):
-        return self.cs.close()
-
-    @property
-    def url(self):
-        return self.cs.url
-
-
-class UrlReader(object):
-    def read(self, size=-1):
-        raise NotImplementedError()
-
-    def close(self):
-        raise NotImplementedError()
-
-
-class FileReader(UrlReader):
-    def __init__(self, path, offset=None, user_agent=None):
-        if path.startswith("file://"):
-            path = path[7:]
-        self.fd = open(path, "rb")
-        if offset is not None:
-            self.fd.seek(offset)
-
-    def read(self, size=-1):
-        return _read_fd(self.fd, size)
-
-    def close(self):
-        return self.fd.close()
-
-
-class Urllib2UrlReader(UrlReader):
-    def __init__(self, url, offset=None, user_agent=None):
-        (url, username, password) = parse_url_auth(url)
-        self.url = url
-        if username is None:
-            opener = urllib_request.urlopen
-        else:
-            mgr = urllib_request.HTTPPasswordMgrWithDefaultRealm()
-            mgr.add_password(None, url, username, password)
-            handler = urllib_request.HTTPBasicAuthHandler(mgr)
-            opener = urllib_request.build_opener(handler).open
-
-        try:
-            req = urllib_request.Request(url)
-            if user_agent is not None:
-                req.add_header('User-Agent', user_agent)
-            if offset is not None:
-                req.add_header('Range', 'bytes=%d-' % offset)
-            self.req = opener(req)
-        except urllib_error.HTTPError as e:
-            if e.code == 404:
-                myerr = IOError("Unable to open %s" % url)
-                myerr.errno = errno.ENOENT
-                raise myerr
-            raise e
-
-    def read(self, size=-1):
-        return _read_fd(self.req, size)
-
-    def close(self):
-        return self.req.close()
-
-
-class RequestsUrlReader(UrlReader):
-    # This provides a url reader that supports deflate/gzip encoding
-    # but still implements 'read'.
-    # r = RequestsUrlReader(http://example.com)
-    # r.read(10)
-    # r.close()
-    def __init__(self, url, buflen=None, offset=None, user_agent=None):
-        if requests is None:
-            raise ImportError("Attempt to use RequestsUrlReader "
-                              "without suitable requests library.")
-        self.url = url
-        (url, user, password) = parse_url_auth(url)
-        if user is None:
-            auth = None
-        else:
-            auth = (user, password)
-
-        headers = {}
-        if user_agent is not None:
-            headers['User-Agent'] = user_agent
-        if offset is not None:
-            headers['Range'] = 'bytes=%d-' % offset
-        if headers == {}:
-            headers = None
-
-        self.req = requests.get(url, stream=True, auth=auth, headers=headers)
-        self.r_iter = None
-        if buflen is None:
-            buflen = READ_BUFFER_SIZE
-        self.buflen = buflen
-        self.leftover = bytes()
-        self.consumed = False
-
-        if (self.req.status_code == requests.codes.NOT_FOUND):
-            myerr = IOError("Unable to open %s" % url)
-            myerr.errno = errno.ENOENT
-            raise myerr
-
-        ce = self.req.headers.get('content-encoding', '').lower()
-        if 'gzip' in ce or 'deflate' in ce:
-            self._read = self.read_compressed
-        else:
-            self._read = self.read_raw
-
-    def read(self, size=-1):
-        return self._read(size)
-
-    def read_compressed(self, size=None):
-        if not self.r_iter:
-            self.r_iter = self.req.iter_content(self.buflen)
-
-        if self.consumed:
-            return bytes()
-
-        if (size is None or size < 0):
-            # read everything
-            ret = self.leftover
-            self.leftover = bytes()
-            for buf in self.r_iter:
-                ret += buf
-            self.consumed = True
-            return ret
-
-        ret = bytes()
-
-        if self.leftover:
-            if len(self.leftover) > size:
-                ret = self.leftover[0:size]
-                self.leftover = self.leftover[size:]
-                return ret
-            ret = self.leftover
-            self.leftover = bytes()
-
-        while True:
-            try:
-                ret += next(self.r_iter)
-                if len(ret) >= size:
-                    self.leftover = ret[size:]
-                    ret = ret[0:size]
-                    break
-            except StopIteration:
-                self.consumed = True
-                break
-        return ret
-
-    def read_raw(self, size=-1):
-        return _read_fd(self.req.raw, size)
-
-    def close(self):
-        self.req.close()
-
-
-def parse_url_auth(url):
-    parsed = urlparse.urlparse(url)
-    authtok = "%s:%s@" % (parsed.username, parsed.password)
-    if parsed.netloc.startswith(authtok):
-        url = url.replace(authtok, "", 1)
-    return (url, parsed.username, parsed.password)
-
-
-def _read_fd(fd, size=-1):
-    # normalize calling of fd.read()
-    # python3 generally wants fd.read(size=None)
-    # python2 generally wants fd.read(size=-1)
-    if size is None or size < 0:
-        return fd.read()
-    return fd.read(size)
-
-
-if URL_READER_CLASSNAME == "RequestsUrlReader":
-    URL_READER = RequestsUrlReader
-elif URL_READER_CLASSNAME == "Urllib2UrlReader":
-    URL_READER = Urllib2UrlReader
-else:
-    raise Exception("Unknown URL_READER_CLASSNAME: %s" % URL_READER_CLASSNAME)
-
-# vi: ts=4 expandtab

=== removed file 'simplestreams/filters.py'
--- simplestreams/filters.py	2016-10-17 20:26:06 +0000
+++ simplestreams/filters.py	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-#   Copyright (C) 2013 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
-
-from simplestreams import util
-
-import re
-
-
-class ItemFilter(object):
-    def __init__(self, content, noneval=""):
-        rparsefmt = r"([\w|\-]+)[ ]*([!]{0,1}[=~])[ ]*(.*)[ ]*$"
-        parsed = re.match(rparsefmt, content)
-
-        if not parsed:
-            raise ValueError("Unable to parse expression %s" % content)
-
-        (key, op, val) = parsed.groups()
-
-        if op in ("!=", "="):
-            self._matches = val.__eq__
-        elif op in ("!~", "~"):
-            self._matches = re.compile(val).search
-        else:
-            raise ValueError("Bad parsing of %s" % content)
-
-        self.negator = (op[0] != "!")
-        self.op = op
-        self.key = key
-        self.value = val
-        self.content = content
-        self.noneval = noneval
-
-    def __str__(self):
-        return "%s %s %s [none=%s]" % (self.key, self.op,
-                                       self.value, self.noneval)
-
-    def __repr__(self):
-        return self.__str__()
-
-    def matches(self, item):
-        val = str(item.get(self.key, self.noneval))
-        return (self.negator == bool(self._matches(val)))
-
-
-def get_filters(filters, noneval=""):
-    flist = []
-    for f in filters:
-        flist.append(ItemFilter(f, noneval=noneval))
-    return flist
-
-
-def filter_item(filters, data, src, pedigree):
-    "Apply filter list to a products entity.  Flatten before doing so."
-    return filter_dict(filters, util.products_exdata(src, pedigree))
-
-
-def filter_dict(filters, data):
-    "Apply filter list to dict. Does not flatten."
-    for f in filters:
-        if not f.matches(data):
-            return False
-    return True

=== removed file 'simplestreams/generate_simplestreams.py'
--- simplestreams/generate_simplestreams.py	2015-11-09 17:47:21 +0000
+++ simplestreams/generate_simplestreams.py	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-#   Copyright (C) 2013, 2015 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>,
-#           Aaron Bentley <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-from collections import namedtuple
-from copy import deepcopy
-import json
-import os
-import sys
-
-from simplestreams import util
-
-
-Item = namedtuple('Item', ['content_id', 'product_name', 'version_name',
-                           'item_name', 'data'])
-
-
-def items2content_trees(itemslist, exdata):
-    # input is a list with each item having:
-    #   (content_id, product_name, version_name, item_name, {data})
-    ctrees = {}
-    for (content_id, prodname, vername, itemname, data) in itemslist:
-        if content_id not in ctrees:
-            ctrees[content_id] = {'content_id': content_id,
-                                  'format': 'products:1.0', 'products': {}}
-            ctrees[content_id].update(exdata)
-
-        ctree = ctrees[content_id]
-        if prodname not in ctree['products']:
-            ctree['products'][prodname] = {'versions': {}}
-
-        prodtree = ctree['products'][prodname]
-        if vername not in prodtree['versions']:
-            prodtree['versions'][vername] = {'items': {}}
-
-        vertree = prodtree['versions'][vername]
-
-        if itemname in vertree['items']:
-            raise ValueError("%s: already existed" %
-                             str([content_id, prodname, vername, itemname]))
-
-        vertree['items'][itemname] = data
-    return ctrees
-
-
-class FileNamer:
-
-    streamdir = 'streams/v1'
-
-    @classmethod
-    def get_index_path(cls):
-        return "%s/%s" % (cls.streamdir, 'index.json')
-
-    @classmethod
-    def get_content_path(cls, content_id):
-        return "%s/%s.json" % (cls.streamdir, content_id)
-
-
-def generate_index(trees, updated, namer):
-    index = {"index": {}, 'format': 'index:1.0', 'updated': updated}
-    not_copied_up = ['content_id']
-    for content_id, content in trees.items():
-        index['index'][content_id] = {
-            'products': list(content['products'].keys()),
-            'path': namer.get_content_path(content_id),
-        }
-        for k in util.stringitems(content):
-            if k not in not_copied_up:
-                index['index'][content_id][k] = content[k]
-    return index
-
-
-def write_streams(out_d, trees, updated, namer=None, condense=True):
-    if namer is None:
-        namer = FileNamer
-    index = generate_index(trees, updated, namer)
-    to_write = [(namer.get_index_path(), index,)]
-    # Don't let products_condense modify the input
-    trees = deepcopy(trees)
-    for content_id in trees:
-        if condense:
-            util.products_condense(trees[content_id],
-                                   sticky=['path', 'sha256', 'md5', 'size'])
-        content = trees[content_id]
-        to_write.append((index['index'][content_id]['path'], content,))
-    out_filenames = []
-    for (outfile, data) in to_write:
-        filef = os.path.join(out_d, outfile)
-        util.mkdir_p(os.path.dirname(filef))
-        json_dump(data, filef)
-        out_filenames.append(filef)
-    return out_filenames
-
-
-def json_dump(data, filename):
-    with open(filename, "w") as fp:
-        sys.stderr.write(u"writing %s\n" % filename)
-        fp.write(json.dumps(data, indent=2, sort_keys=True,
-                 separators=(',', ': ')) + "\n")

=== removed file 'simplestreams/json2streams.py'
--- simplestreams/json2streams.py	2016-03-10 16:25:44 +0000
+++ simplestreams/json2streams.py	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-#!/usr/bin/env python3
-#   Copyright (C) 2013, 2015 Canonical Ltd.
-
-from argparse import ArgumentParser
-import json
-import os
-import sys
-
-from simplestreams import util
-
-from simplestreams.generate_simplestreams import (
-    FileNamer,
-    Item,
-    items2content_trees,
-    json_dump,
-    write_streams,
-    )
-
-
-class JujuFileNamer(FileNamer):
-
-    @classmethod
-    def get_index_path(cls):
-        return "%s/%s" % (cls.streamdir, 'index2.json')
-
-    @classmethod
-    def get_content_path(cls, content_id):
-        return "%s/%s.json" % (cls.streamdir, content_id.replace(':', '-'))
-
-
-def dict_to_item(item_dict):
-    """Convert a dict into an Item, mutating input."""
-    item_dict.pop('item_url', None)
-    size = item_dict.get('size')
-    if size is not None:
-        item_dict['size'] = int(size)
-    content_id = item_dict.pop('content_id')
-    product_name = item_dict.pop('product_name')
-    version_name = item_dict.pop('version_name')
-    item_name = item_dict.pop('item_name')
-    return Item(content_id, product_name, version_name, item_name, item_dict)
-
-
-def read_items_file(filename):
-    with open(filename) as items_file:
-        item_list = json.load(items_file)
-    return (dict_to_item(item) for item in item_list)
-
-
-def write_release_index(out_d):
-    in_path = os.path.join(out_d, JujuFileNamer.get_index_path())
-    with open(in_path) as in_file:
-        full_index = json.load(in_file)
-    full_index['index'] = dict(
-        (k, v) for k, v in list(full_index['index'].items())
-        if k == 'com.ubuntu.juju:released:tools')
-    out_path = os.path.join(out_d, FileNamer.get_index_path())
-    json_dump(full_index, out_path)
-    return out_path
-
-
-def filenames_to_streams(filenames, updated, out_d, juju_format=False):
-    """Convert a list of filenames into simplestreams.
-
-    File contents must be json simplestream stanzas.
-    'updated' is the date to use for 'updated' in the streams.
-    out_d is the directory to create streams in.
-    """
-    items = []
-    for items_file in filenames:
-        items.extend(read_items_file(items_file))
-
-    data = {'updated': updated, 'datatype': 'content-download'}
-    trees = items2content_trees(items, data)
-    if juju_format:
-        write = write_juju_streams
-    else:
-        write = write_streams
-    return write(out_d, trees, updated)
-
-
-def write_juju_streams(out_d, trees, updated):
-    out_filenames = write_streams(out_d, trees, updated, JujuFileNamer)
-    out_filenames.append(write_release_index(out_d))
-    return out_filenames
-
-
-def parse_args(argv=None):
-    parser = ArgumentParser()
-    parser.add_argument(
-        'items_file', metavar='items-file', help='File to read items from',
-        nargs='+')
-    parser.add_argument(
-        'out_d', metavar='output-dir',
-        help='The directory to write stream files to.')
-    parser.add_argument(
-        '--juju-format', action='store_true',
-        help='Write stream files in juju format.')
-    return parser.parse_args(argv)
-
-
-def main():
-    args = parse_args()
-    updated = util.timestamp()
-    filenames_to_streams(args.items_file, updated, args.out_d,
-                         args.juju_format)
-
-
-if __name__ == '__main__':
-    sys.exit(main())

=== removed file 'simplestreams/log.py'
--- simplestreams/log.py	2014-07-15 21:33:53 +0000
+++ simplestreams/log.py	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-#   Copyright (C) 2013 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
-
-import logging
-
-DEBUG = logging.DEBUG
-ERROR = logging.ERROR
-FATAL = logging.FATAL
-INFO = logging.INFO
-NOTSET = logging.NOTSET
-WARN = logging.WARN
-WARNING = logging.WARNING
-
-
-class NullHandler(logging.Handler):
-    def emit(self, record):
-        pass
-
-
-def basicConfig(**kwargs):
-    # basically like logging.basicConfig but only output for our logger
-    if kwargs.get('filename'):
-        handler = logging.FileHandler(filename=kwargs['filename'],
-                                      mode=kwargs.get('filemode', 'a'))
-    elif kwargs.get('stream'):
-        handler = logging.StreamHandler(stream=kwargs['stream'])
-    else:
-        handler = NullHandler()
-
-    level = kwargs.get('level', NOTSET)
-
-    handler.setFormatter(logging.Formatter(fmt=kwargs.get('format'),
-                                           datefmt=kwargs.get('datefmt')))
-    handler.setLevel(level)
-
-    logging.getLogger().setLevel(level)
-
-    logger = _getLogger()
-    for h in list(logger.handlers):
-        logger.removeHandler(h)
-    logger.setLevel(level)
-    logger.addHandler(handler)
-
-
-def _getLogger(name='sstreams'):
-    return logging.getLogger(name)
-
-
-if not logging.getLogger().handlers:
-    logging.getLogger().addHandler(NullHandler())
-
-LOG = _getLogger()
-
-# vi: ts=4 expandtab syntax=python

=== removed directory 'simplestreams/mirrors'
=== removed file 'simplestreams/mirrors/__init__.py'
--- simplestreams/mirrors/__init__.py	2016-06-10 11:20:18 +0000
+++ simplestreams/mirrors/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,585 +0,0 @@
-#   Copyright (C) 2013 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
-import errno
-import io
-import json
-
-import simplestreams.filters as filters
-import simplestreams.util as util
-from simplestreams import checksum_util
-import simplestreams.contentsource as cs
-from simplestreams.log import LOG
-
-DEFAULT_USER_AGENT = "python-simplestreams/0.1"
-
-
-class MirrorReader(object):
-    def __init__(self, policy=util.policy_read_signed):
-        """ policy should be a function which returns the extracted payload or
-        raises an exception if the policy is violated. """
-        self.policy = policy
-
-    def load_products(self, path):
-        _, content = self.read_json(path)
-        return util.load_content(content)
-
-    def read_json(self, path):
-        with self.source(path) as source:
-            raw = source.read().decode('utf-8')
-        return raw, self.policy(content=raw, path=path)
-
-    def source(self, path):
-        raise NotImplementedError()
-
-
-class MirrorWriter(object):
-    def load_products(self, path=None, content_id=None):
-        raise NotImplementedError()
-
-    def sync_products(self, reader, path=None, products=None, content=None):
-        # reader:   a Reader for opening files referenced in products
-        # path:     the path of where to store this.
-        #           if path is None, do not store the products file itself
-        # products: a products file in products:1.0 format
-        # content:  a rendered products tree, allowing you to store
-        #           externally signed content.
-        #
-        # One of content, path, or products is required.
-        #  * if path is not given, no rendering of products tree will be stored
-        #  * if content is None, it will be loaded from reader(path).read()
-        #    or rendered (json.dumps(products)) from products.
-        #  * if products is None, it will be loaded from content
-        raise NotImplementedError()
-
-    def sync_index(self, reader, path=None, src=None, content=None):
-        # reader:   a Reader for opening files referenced in index or products
-        #           files
-        # path:     the path of where to store this.
-        #           if path is None, do not store the index file itself
-        # src:      a dictionary in index:1.0 format
-        # content:  a rendered products tree, allowing you to store
-        #           externally signed content.
-        #
-        # One of content, path, or products is required.
-        #  * if path not given, no rendering of products tree will be stored
-        #  * if content is None, it will be loaded from reader(path).read()
-        #    or rendered (json.dumps(products)) from products.
-        #  * if products is None, it will be loaded from content
-        raise NotImplementedError()
-
-    def sync(self, reader, path):
-        content, payload = reader.read_json(path)
-        data = util.load_content(payload)
-        fmt = data.get("format", "UNSPECIFIED")
-        if fmt == "products:1.0":
-            return self.sync_products(reader, path, data, content)
-        elif fmt == "index:1.0":
-            return self.sync_index(reader, path, data, content)
-        else:
-            raise TypeError("Unknown format '%s' in '%s'" % (fmt, path))
-
-    # Index Operations
-    def filter_index_entry(self, data, src, pedigree):
-        # src is source index tree.
-        # data is src['index'][ped[0]]
-        return True
-
-    def insert_index(self, path, src, content):
-        # src is the source index tree
-        # content is None or a json rendering (possibly signed) of src
-        pass
-
-    def insert_index_entry(self, data, src, pedigree, contentsource):
-        # src is the top level index (index:1.0 format)
-        # data is src['index'][pedigree[0]]
-        # contentsource is a ContentSource if 'path' exists in data or None
-        pass
-
-    # Products Operations
-    def filter_product(self, data, src, target, pedigree):
-        # src and target are top level products:1.0
-        # data is src['products'][ped[0]]
-        return True
-
-    def filter_version(self, data, src, target, pedigree):
-        # src and target are top level products:1.0
-        # data is src['products'][ped[0]]['versions'][ped[1]]
-        return True
-
-    def filter_item(self, data, src, target, pedigree):
-        # src and target are top level products:1.0
-        # data is src['products'][ped[0]]['versions'][ped[1]]['items'][ped[2]]
-        return True
-
-    def insert_products(self, path, target, content):
-        # path is the path to store data (where it came from on source mirror)
-        # target is the target products:1.0 tree
-        # content is None or a json rendering (possibly signed) of src
-        pass
-
-    def insert_product(self, data, src, target, pedigree):
-        # src and target are top level products:1.0
-        # data is src['products'][ped[0]]
-        pass
-
-    def insert_version(self, data, src, target, pedigree):
-        # src and target are top level products:1.0
-        # data is src['products'][ped[0]]['versions'][ped[1]]
-        pass
-
-    def insert_item(self, data, src, target, pedigree, contentsource):
-        # src and target are top level products:1.0
-        # data is src['products'][ped[0]]['versions'][ped[1]]['items'][ped[2]]
-        # contentsource is a ContentSource if 'path' exists in data or None
-        pass
-
-    def remove_product(self, data, src, target, pedigree):
-        # src and target are top level products:1.0
-        # data is src['products'][ped[0]]
-        pass
-
-    def remove_version(self, data, src, target, pedigree):
-        # src and target are top level products:1.0
-        # data is src['products'][ped[0]]['versions'][ped[1]]
-        pass
-
-    def remove_item(self, data, src, target, pedigree):
-        # src and target are top level products:1.0
-        # data is src['products'][ped[0]]['versions'][ped[1]]['items'][ped[2]]
-        pass
-
-
-class UrlMirrorReader(MirrorReader):
-    def __init__(self, prefix, mirrors=None, policy=util.policy_read_signed,
-                 user_agent=DEFAULT_USER_AGENT):
-        super(UrlMirrorReader, self).__init__(policy=policy)
-        self._cs = cs.UrlContentSource
-        if mirrors is None:
-            mirrors = []
-        self.mirrors = mirrors
-        self.user_agent = user_agent
-        self.prefix = prefix
-        self._trailing_slash_checked = self.prefix.endswith("/")
-
-    def source(self, path):
-        mirrors = [m + path for m in self.mirrors]
-
-        if self.user_agent is not None:
-            # Create a custom UrlReader with the user_agent passed in,
-            # using the default cs.URL_READER.
-
-            def url_reader_factory(*args, **kwargs):
-                return cs.URL_READER(
-                    *args, user_agent=self.user_agent, **kwargs)
-        else:
-            url_reader_factory = None
-
-        if self._trailing_slash_checked:
-            return self._cs(self.prefix + path, mirrors=mirrors,
-                            url_reader=url_reader_factory)
-
-        # A little hack to fix up the user's path. It's fairly common to
-        # specify URLs without a trailing slash, so we try to do that here as
-        # well. We open, then close and then get a new one (so the one we
-        # returned is not yet open (LP: #1237658)
-        self._trailing_slash_checked = True
-        try:
-            with self._cs(self.prefix + path, mirrors=None,
-                          url_reader=url_reader_factory) as csource:
-                csource.read(1024)
-        except Exception as e:
-            if isinstance(e, IOError) and (e.errno == errno.ENOENT):
-                LOG.warn("got ENOENT for (%s, %s), trying with trailing /",
-                         self.prefix, path)
-                self.prefix = self.prefix + '/'
-            else:
-                # this raised exception, but it was sneaky to do it
-                # so just ignore it.
-                LOG.debug("trailing / check on (%s, %s) resulted in %s",
-                          self.prefix, path, e)
-
-        return self._cs(self.prefix + path, mirrors=mirrors,
-                        url_reader=url_reader_factory)
-
-
-class ObjectStoreMirrorReader(MirrorReader):
-    def __init__(self, objectstore, policy=util.policy_read_signed):
-        super(ObjectStoreMirrorReader, self).__init__(policy=policy)
-        self.objectstore = objectstore
-
-    def source(self, path):
-        return self.objectstore.source(path)
-
-
-class BasicMirrorWriter(MirrorWriter):
-    def __init__(self, config=None):
-        super(BasicMirrorWriter, self).__init__()
-        if config is None:
-            config = {}
-        self.config = config
-        self.checksumming_reader = self.config.get('checksumming_reader', True)
-
-    def load_products(self, path=None, content_id=None):
-        super(BasicMirrorWriter, self).load_products(path, content_id)
-
-    def sync_index(self, reader, path=None, src=None, content=None):
-        (src, content) = _get_data_content(path, src, content, reader)
-
-        util.expand_tree(src)
-
-        check_tree_paths(src)
-
-        itree = src.get('index')
-        for content_id, index_entry in itree.items():
-            if not self.filter_index_entry(index_entry, src, (content_id,)):
-                continue
-            epath = index_entry.get('path', None)
-            mycs = None
-            if epath:
-                if index_entry.get('format') in ("index:1.0", "products:1.0"):
-                    self.sync(reader, path=epath)
-                mycs = reader.source(epath)
-
-            self.insert_index_entry(index_entry, src, (content_id,), mycs)
-
-        self.insert_index(path, src, content)
-
-    def sync_products(self, reader, path=None, src=None, content=None):
-        (src, content) = _get_data_content(path, src, content, reader)
-
-        util.expand_tree(src)
-
-        check_tree_paths(src)
-
-        content_id = src['content_id']
-        target = self.load_products(path, content_id)
-        if not target:
-            target = util.stringitems(src)
-
-        util.expand_tree(target)
-
-        stree = src.get('products', {})
-        if 'products' not in target:
-            target['products'] = {}
-
-        tproducts = target['products']
-
-        filtered_products = []
-        prodname = None
-        for prodname, product in stree.items():
-            if not self.filter_product(product, src, target, (prodname,)):
-                filtered_products.append(prodname)
-                continue
-
-            if prodname not in tproducts:
-                tproducts[prodname] = util.stringitems(product)
-            tproduct = tproducts[prodname]
-            if 'versions' not in tproduct:
-                tproduct['versions'] = {}
-
-            src_filtered_items = []
-
-            def _filter(itemkey):
-                ret = self.filter_version(product['versions'][itemkey],
-                                          src, target, (prodname, itemkey))
-                if not ret:
-                    src_filtered_items.append(itemkey)
-                return ret
-
-            (to_add, to_remove) = util.resolve_work(
-                src=list(product.get('versions', {}).keys()),
-                target=list(tproduct.get('versions', {}).keys()),
-                maxnum=self.config.get('max_items'),
-                keep=self.config.get('keep_items'), itemfilter=_filter)
-
-            LOG.info("%s/%s: to_add=%s to_remove=%s", content_id, prodname,
-                     to_add, to_remove)
-
-            tversions = tproduct['versions']
-            skipped_versions = []
-            for vername in to_add:
-                version = product['versions'][vername]
-
-                if vername not in tversions:
-                    tversions[vername] = util.stringitems(version)
-
-                added_items = []
-                for itemname, item in version.get('items', {}).items():
-                    pgree = (prodname, vername, itemname)
-                    if not self.filter_item(item, src, target, pgree):
-                        LOG.debug("Filtered out item: %s/%s", itemname, item)
-                        continue
-
-                    added_items.append(itemname)
-
-                    ipath = item.get('path', None)
-                    ipath_cs = None
-                    if ipath and reader:
-                        if self.checksumming_reader:
-                            flat = util.products_exdata(src, pgree)
-                            ipath_cs = cs.ChecksummingContentSource(
-                                csrc=reader.source(ipath),
-                                size=flat.get('size'),
-                                checksums=checksum_util.item_checksums(flat))
-                        else:
-                            ipath_cs = reader.source(ipath)
-
-                    self.insert_item(item, src, target, pgree, ipath_cs)
-
-                if len(added_items):
-                    # do not insert versions that had all items filtered
-                    self.insert_version(version, src, target,
-                                        (prodname, vername))
-                else:
-                    skipped_versions.append(vername)
-
-            for vername in skipped_versions:
-                if vername in tproduct['versions']:
-                    del tproduct['versions'][vername]
-
-            if self.config.get('delete_filtered_items', False):
-                tkeys = tproduct.get('versions', {}).keys()
-                for v in src_filtered_items:
-                    if v not in to_remove and v in tkeys:
-                        to_remove.append(v)
-                LOG.info("After deletions %s/%s: to_add=%s to_remove=%s",
-                         content_id, prodname, to_add, to_remove)
-
-            for vername in to_remove:
-                tversion = tversions[vername]
-                for itemname in list(tversion.get('items', {}).keys()):
-                    self.remove_item(tversion['items'][itemname], src, target,
-                                     (prodname, vername, itemname))
-
-                self.remove_version(tversion, src, target, (prodname, vername))
-                del tversions[vername]
-
-            self.insert_product(tproduct, src, target, (prodname,))
-
-        # FIXME: below will remove products if they're in target
-        # (result of load_products) but not in the source products.
-        # that could accidentally delete a lot.
-        #
-        del_products = []
-        if self.config.get('delete_products', False):
-            del_products.extend([p for p in list(tproducts.keys())
-                                 if p not in stree])
-        if self.config.get('delete_filtered_products', False):
-            del_products.extend([p for p in filtered_products
-                                 if p not in stree])
-
-        for prodname in del_products:
-            # FIXME: we remove a product here, but unless that acts
-            # recursively, nothing will remove the items in that product
-            self.remove_product(tproducts[prodname], src, target, (prodname,))
-            del tproducts[prodname]
-
-        self.insert_products(path, target, content)
-
-
-# ObjectStoreMirrorWriter stores data in <prefix>/.data/<content_id>
-class ObjectStoreMirrorWriter(BasicMirrorWriter):
-    def __init__(self, config, objectstore):
-        super(ObjectStoreMirrorWriter, self).__init__(config=config)
-        self.store = objectstore
-
-    def products_data_path(self, content_id):
-        return ".data/%s" % content_id
-
-    def _reference_count_data_path(self):
-        return ".data/references.json"
-
-    def _load_rc_dict(self):
-        try:
-            with self.source(self._reference_count_data_path()) as source:
-                raw = source.read()
-            return json.load(io.StringIO(raw.decode('utf-8')))
-        except IOError as e:
-            if e.errno == errno.ENOENT:
-                return {}
-            raise
-
-    def _persist_rc_dict(self, rc):
-        source = cs.MemoryContentSource(content=json.dumps(rc))
-        self.store.insert(self._reference_count_data_path(), source)
-
-    def _build_rc_id(self, src, pedigree):
-        return '/'.join([src['content_id']] + list(pedigree))
-
-    def _inc_rc(self, path, src, pedigree):
-        rc = self._load_rc_dict()
-        id_ = self._build_rc_id(src, pedigree)
-        if path not in rc:
-            rc[path] = [id_]
-        else:
-            rc[path].append(id_)
-        self._persist_rc_dict(rc)
-
-    def _dec_rc(self, path, src, pedigree):
-        rc = self._load_rc_dict()
-        id_ = self._build_rc_id(src, pedigree)
-        entry = rc.get(path, None)
-        ok_to_delete = False
-        if entry is not None:
-            if len(entry) == 1:
-                del rc[path]
-                ok_to_delete = True
-            else:
-                rc[path] = list(filter(lambda x: x != id_, rc[path]))
-            self._persist_rc_dict(rc)
-        return ok_to_delete
-
-    def load_products(self, path=None, content_id=None):
-        if content_id:
-            try:
-                dpath = self.products_data_path(content_id)
-                with self.source(dpath) as source:
-                    return util.load_content(source.read())
-            except IOError as e:
-                if e.errno != errno.ENOENT:
-                    raise
-
-        if path:
-            # we possibly have 'path' that we could read.
-            # but returning that would indicate we have inserted all items
-            # rather than just the list of items that were mirrored.
-            # this is because the .data/ entry was missing.
-            # thus, just return empty.
-            return {}
-
-        raise TypeError("unable to load_products with no path")
-
-    def source(self, path):
-        return self.store.source(path)
-
-    def insert_item(self, data, src, target, pedigree, contentsource):
-        util.products_set(target, data, pedigree)
-        if 'path' not in data:
-            return
-        if not self.config.get('item_download', True):
-            return
-        LOG.debug("inserting %s to %s", contentsource.url, data['path'])
-        self.store.insert(data['path'], contentsource,
-                          checksums=checksum_util.item_checksums(data),
-                          mutable=False, size=data.get('size'))
-        self._inc_rc(data['path'], src, pedigree)
-
-    def insert_index_entry(self, data, src, pedigree, contentsource):
-        epath = data.get('path', None)
-        if not epath:
-            return
-        self.store.insert(epath, contentsource,
-                          checksums=checksum_util.item_checksums(data))
-
-    def insert_products(self, path, target, content):
-        dpath = self.products_data_path(target['content_id'])
-        self.store.insert_content(dpath, util.dump_data(target))
-        if not path:
-            return
-        if not content:
-            content = util.dump_data(target)
-        self.store.insert_content(path, content)
-
-    def insert_index(self, path, src, content):
-        if not path:
-            return
-        if not content:
-            content = util.dump_data(src)
-        self.store.insert_content(path, content)
-
-    def remove_item(self, data, src, target, pedigree):
-        util.products_del(target, pedigree)
-        if 'path' not in data:
-            return
-        if self._dec_rc(data['path'], src, pedigree):
-            self.store.remove(data['path'])
-
-
-class ObjectFilterMirror(ObjectStoreMirrorWriter):
-    def __init__(self, *args, **kwargs):
-        super(ObjectFilterMirror, self).__init__(*args, **kwargs)
-        self.filters = self.config.get('filters', [])
-
-    def filter_item(self, data, src, target, pedigree):
-        return filters.filter_item(self.filters, data, src, pedigree)
-
-
-class DryRunMirrorWriter(ObjectFilterMirror):
-    def __init__(self, *args, **kwargs):
-        super(DryRunMirrorWriter, self).__init__(*args, **kwargs)
-        self.downloading = []
-        self.removing = []
-
-    # All insert/remove operations are noops.
-    def noop(*args):
-        pass
-
-    insert_index = noop
-    insert_index_entry = noop
-    insert_products = noop
-    insert_product = noop
-    insert_version = noop
-    remove_product = noop
-    remove_version = noop
-
-    def insert_item(self, data, src, target, pedigree, contentsource):
-        data = util.products_exdata(src, pedigree)
-        if 'size' in data and 'path' in data:
-            self.downloading.append(
-                (pedigree, data['path'], int(data['size'])))
-
-    def remove_item(self, data, src, target, pedigree):
-        data = util.products_exdata(src, pedigree)
-        if 'size' in data and 'path' in data:
-            self.removing.append(
-                (pedigree, data['path'], int(data['size'])))
-
-    @property
-    def size(self):
-        downloading = sum([size for _, _, size in self.downloading])
-        removing = sum([size for _, _, size in self.removing])
-        return int(downloading - removing)
-
-
-def _get_data_content(path, data, content, reader):
-    if content is None and path:
-        _, content = reader.read(path)
-        if isinstance(content, bytes):
-            content = content.decode('utf-8')
-
-    if data is None and content:
-        data = util.load_content(content)
-
-    if not data:
-        raise ValueError("Data could not be loaded. "
-                         "Path or content is required")
-    return (data, content)
-
-
-def check_tree_paths(tree, fmt=None):
-    if fmt is None:
-        fmt = tree.get('format')
-    if fmt == "products:1.0":
-        def check_path(item, tree, pedigree):
-            util.assert_safe_path(item.get('path'))
-        util.walk_products(tree, cb_item=check_path)
-    elif fmt == "index:1.0":
-        index = tree.get('index')
-        for content_id in index:
-            util.assert_safe_path(index[content_id].get('path'))
-
-# vi: ts=4 expandtab

=== removed file 'simplestreams/mirrors/command_hook.py'
--- simplestreams/mirrors/command_hook.py	2014-07-15 21:39:59 +0000
+++ simplestreams/mirrors/command_hook.py	1970-01-01 00:00:00 +0000
@@ -1,302 +0,0 @@
-#   Copyright (C) 2013 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
-
-import simplestreams.mirrors as mirrors
-import simplestreams.util as util
-
-import os
-import errno
-import signal
-import subprocess
-import tempfile
-
-REQUIRED_FIELDS = ("load_products",)
-HOOK_NAMES = (
-    "filter_index_entry",
-    "filter_item",
-    "filter_product",
-    "filter_version",
-    "insert_index",
-    "insert_index_entry",
-    "insert_item",
-    "insert_product",
-    "insert_products",
-    "insert_version",
-    "load_products",
-    "remove_item",
-    "remove_product",
-    "remove_version",
-)
-
-DEFAULT_HOOK_NAME = "hook"
-ENV_HOOK_NAME = "HOOK"
-ENV_FIELDS_NAME = "FIELDS"
-
-
-class CommandHookMirror(mirrors.BasicMirrorWriter):
-    """
-    CommandHookMirror: invoke commands to implement a SimpleStreamMirror
-
-    Available command hooks:
-      load_products:
-        invoked to list items in the products in a given content_id.
-        See product_load_output_format.
-
-      filter_index_entry, filter_item, filter_product, filter_version:
-        invoked to determine if the named entity should be operated on
-        exit 0 for "yes", 1 for "no".
-
-      insert_index, insert_index_entry, insert_item, insert_product,
-      insert_products, insert_version :
-        invoked to insert the given entity.
-
-      remove_product, remove_version, remove_item:
-        invoked to remove the given entity
-
-
-    Other Configuration:
-      product_load_output_format: one of [serial_list, json]
-        serial_list: The default output should be white space delimited
-                     output of product_name and version.
-        json: output should be a json formated dictionary formated like
-              products:1.0 content.
-
-    Environments / Variables:
-      When a hook is invoked, data about the relevant entity is
-      made available in the environment.
-
-      In all cases:
-        * a special 'FIELDS' key is available which is a space delimited
-          list of keys
-        * a special 'HOOK' field is available that specifies which
-          hook is being called.
-
-      For an item in a products:1.0 file that has a 'path' item, the item
-      will be downloaded and a 'path_local' field inserted into the metadata
-      which will contain the path to the local file.
-
-      If the configuration setting 'item_skip_download' is set to True, then
-      'path_url' will be set instead to a url where the item can be found.
-    """
-    def __init__(self, config):
-        if isinstance(config, str):
-            config = util.load_content(config)
-        check_config(config)
-
-        super(CommandHookMirror, self).__init__(config=config)
-
-    def load_products(self, path=None, content_id=None):
-        (_rc, output) = self.call_hook('load_products',
-                                       data={'content_id': content_id},
-                                       capture=True)
-        fmt = self.config.get("product_load_output_format", "serial_list")
-
-        loaded = load_product_output(output=output, content_id=content_id,
-                                     fmt=fmt)
-        return loaded
-
-    def filter_index_entry(self, data, src, pedigree):
-        mdata = util.stringitems(src)
-        mdata['content_id'] = pedigree[0]
-        mdata.update(util.stringitems(data))
-
-        (ret, _output) = self.call_hook('filter_index_entry', data=mdata,
-                                        rcs=[0, 1])
-        return ret == 0
-
-    def filter_product(self, data, src, target, pedigree):
-        return self._call_filter('filter_product', src, pedigree)
-
-    def filter_version(self, data, src, target, pedigree):
-        return self._call_filter('filter_version', src, pedigree)
-
-    def filter_item(self, data, src, target, pedigree):
-        return self._call_filter('filter_item', src, pedigree)
-
-    def _call_filter(self, name, src, pedigree):
-        data = util.products_exdata(src, pedigree)
-        (ret, _output) = self.call_hook(name, data=data, rcs=[0, 1])
-        return ret == 0
-
-    def insert_index(self, path, src, content):
-        return self.call_hook('insert_index', data=src, content=content,
-                              extra={'path': path})
-
-    def insert_products(self, path, target, content):
-        return self.call_hook('insert_products', data=target,
-                              content=content, extra={'path': path})
-
-    def insert_product(self, data, src, target, pedigree):
-        return self.call_hook('insert_product',
-                              data=util.products_exdata(src, pedigree))
-
-    def insert_version(self, data, src, target, pedigree):
-        return self.call_hook('insert_version',
-                              data=util.products_exdata(src, pedigree))
-
-    def insert_item(self, data, src, target, pedigree, contentsource):
-        mdata = util.products_exdata(src, pedigree)
-
-        tmp_path = None
-        tmp_del = None
-        extra = {}
-        if 'path' in data:
-            extra.update({'item_url': contentsource.url})
-            if not self.config.get('item_skip_download', False):
-                try:
-                    (tmp_path, tmp_del) = util.get_local_copy(contentsource)
-                    extra['path_local'] = tmp_path
-                finally:
-                    contentsource.close()
-
-        try:
-            ret = self.call_hook('insert_item', data=mdata, extra=extra)
-        finally:
-            if tmp_del and os.path.exists(tmp_path):
-                os.unlink(tmp_path)
-        return ret
-
-    def remove_product(self, data, src, target, pedigree):
-        return self.call_hook('remove_product',
-                              data=util.products_exdata(src, pedigree))
-
-    def remove_version(self, data, src, target, pedigree):
-        return self.call_hook('remove_version',
-                              data=util.products_exdata(src, pedigree))
-
-    def remove_item(self, data, src, target, pedigree):
-        return self.call_hook('remove_item',
-                              data=util.products_exdata(target, pedigree))
-
-    def call_hook(self, hookname, data, capture=False, rcs=None, extra=None,
-                  content=None):
-        command = self.config.get(hookname, self.config.get(DEFAULT_HOOK_NAME))
-        if not command:
-            # return successful execution with no output
-            return (0, '')
-
-        if isinstance(command, str):
-            command = ['sh', '-c', command]
-
-        fdata = util.stringitems(data)
-
-        content_file = None
-        if content is not None:
-            (tfd, content_file) = tempfile.mkstemp()
-            tfile = os.fdopen(tfd, "w")
-            tfile.write(content)
-            tfile.close()
-            fdata['content_file_path'] = content_file
-
-        if extra:
-            fdata.update(extra)
-        fdata['HOOK'] = hookname
-
-        try:
-            return call_hook(command=command, data=fdata,
-                             unset=self.config.get('unset_value', None),
-                             capture=capture, rcs=rcs)
-        finally:
-            if content_file:
-                os.unlink(content_file)
-
-
-def call_hook(command, data, unset=None, capture=False, rcs=None):
-    env = os.environ.copy()
-    data = data.copy()
-
-    data[ENV_FIELDS_NAME] = ' '.join([k for k in data if k != ENV_HOOK_NAME])
-
-    mcommand = render(command, data, unset=unset)
-
-    env.update(data)
-    return run_command(mcommand, env=env, capture=capture, rcs=rcs)
-
-
-def render(inputs, data, unset=None):
-    fdata = data.copy()
-    outputs = []
-    for i in inputs:
-        while True:
-            try:
-                outputs.append(i % fdata)
-                break
-            except KeyError as err:
-                if unset is None:
-                    raise
-                for key in err.args:
-                    fdata[key] = unset
-    return outputs
-
-
-def check_config(config):
-    missing = []
-    for f in REQUIRED_FIELDS:
-        if f not in config and config.get(DEFAULT_HOOK_NAME) is None:
-            missing.append(f)
-    if missing:
-        raise TypeError("Missing required config entries for %s" % missing)
-
-
-def load_product_output(output, content_id, fmt="serial_list"):
-    # parse command output and return
-
-    if fmt == "serial_list":
-        # "line" format just is a list of serials that are present
-        working = {'content_id': content_id, 'products': {}}
-        for line in output.splitlines():
-            (product_id, version) = line.split(None, 1)
-            if product_id not in working['products']:
-                working['products'][product_id] = {'versions': {}}
-            working['products'][product_id]['versions'][version] = {}
-        return working
-
-    elif fmt == "json":
-        return util.load_content(output)
-
-    return
-
-
-def run_command(cmd, env=None, capture=False, rcs=None):
-    if not rcs:
-        rcs = [0]
-
-    if not capture:
-        stdout = None
-    else:
-        stdout = subprocess.PIPE
-
-    sp = subprocess.Popen(cmd, env=env, stdout=stdout, shell=False)
-    (out, _err) = sp.communicate()
-    rc = sp.returncode
-
-    if rc == 0x80 | signal.SIGPIPE:
-        exc = IOError("Child Received SIGPIPE: %s" % str(cmd))
-        exc.errno = errno.EPIPE
-        raise exc
-
-    if rc not in rcs:
-        raise subprocess.CalledProcessError(rc, cmd)
-
-    if out is None:
-        out = ''
-    elif isinstance(out, bytes):
-        out = out.decode('utf-8')
-
-    return (rc, out)
-
-# vi: ts=4 expandtab syntax=python

=== removed file 'simplestreams/mirrors/glance.py'
--- simplestreams/mirrors/glance.py	2017-11-02 18:43:37 +0000
+++ simplestreams/mirrors/glance.py	1970-01-01 00:00:00 +0000
@@ -1,641 +0,0 @@
-#   Copyright (C) 2013 Canonical Ltd.
-#
-#   Author: Scott Moser <[e-mail]>
-#
-#   Simplestreams is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU Affero General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   Simplestreams 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 Affero General Public
-#   License for more details.
-#
-#   You should have received a copy of the GNU Affero General Public License
-#   along with Simplestreams.  If not, see <http://www.gnu.org/licenses/>.
-
-import simplestreams.filters as filters
-import simplestreams.mirrors as mirrors
-import simplestreams.util as util
-from simplestreams import checksum_util
-import simplestreams.openstack as openstack
-from simplestreams.log import LOG
-
-import copy
-import errno
-import glanceclient
-import json
-import os
-import re
-
-
-def get_glanceclient(version='1', **kwargs):
-    # newer versions of the glanceclient will do this 'strip_version' for
-    # us, but older versions do not.
-    kwargs['endpoint'] = _strip_version(kwargs['endpoint'])
-    pt = ('endpoint', 'token', 'insecure', 'cacert')
-    kskw = {k: kwargs.get(k) for k in pt if k in kwargs}
-    if kwargs.get('session'):
-        sess = kwargs.get('session')
-        return glanceclient.Client(version, session=sess)
-    else:
-        return glanceclient.Client(version, **kskw)
-
-
-def empty_iid_products(content_id):
-    return {'content_id': content_id, 'products': {},
-            'datatype': 'image-ids', 'format': 'products:1.0'}
-
-
-def canonicalize_arch(arch):
-    '''Canonicalize Ubuntu archs for use in OpenStack'''
-    newarch = arch.lower()
-    if newarch == "amd64":
-        newarch = "x86_64"
-    if newarch == "i386":
-        newarch = "i686"
-    if newarch == "ppc64el":
-        newarch = "ppc64le"
-    if newarch == "powerpc":
-        newarch = "ppc"
-    if newarch == "armhf":
-        newarch = "armv7l"