~ubuntu-cloud-archive/ubuntu/precise/glance/folsom

« back to all changes in this revision

Viewing changes to glance/db/sqlalchemy/api.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Soren Hansen
  • Date: 2012-09-07 12:17:46 UTC
  • mfrom: (1.1.42)
  • Revision ID: package-import@ubuntu.com-20120907121746-a4i0aewhlzb7vw31
Tags: 2012.2~rc1~20120907.129.f0bd856-0ubuntu1
[ Chuck Short ]
* New upstream version.
* drop debian/patches/fix-docs-build.patch. 
* debian/rules: Re-activate tests.
* debain/control: Add depends on python-swiftclient.
* debian/*.usptart: make glance start from runlevel 1 to runlevel
  2. (LP: #820688)

[ Soren Hansen ]
* Update debian/watch to account for symbolically named tarballs and
  use newer URL.
* New snapshot.
* Refresh disable-network-for-docs.patch
* Fix Launchpad URLs in debian/watch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
648
648
        if image_id:
649
649
            # Don't drop created_at if we're passing it in...
650
650
            _drop_protected_attrs(models.Image, values)
 
651
            #NOTE(iccha-sethi): updated_at must be explicitly set in case
 
652
            #                   only ImageProperty table was modifited
 
653
            values['updated_at'] = timeutils.utcnow()
651
654
        image_ref.update(values)
652
655
 
653
656
        # Validate the attributes before we go any further. From my
837
840
    tags = session.query(models.ImageTag).\
838
841
                   filter_by(image_id=image_id).\
839
842
                   filter_by(deleted=False).\
 
843
                   order_by(sqlalchemy.asc(models.ImageTag.created_at)).\
840
844
                   all()
841
845
    return [tag['value'] for tag in tags]