[Python-modules-commits] [python-aptly] 01/03: Import python-aptly_0.7.9.orig.tar.gz

[Filip Pytloun]

This is an automated email from the git hooks/post-receive script.

fpytloun-guest pushed a commit to branch master
in repository python-aptly.

commit 352e7b8fbe053c2b84061ebebeb95d070d321c18
Author: Filip Pytloun <filip at pytloun.cz>
Date:   Tue Sep 6 17:34:18 2016 +0200

    Import python-aptly_0.7.9.orig.tar.gz
---
 aptly/publisher/__init__.py | 5 +++--
 aptly/publisher/__main__.py | 2 +-
 setup.py                    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/aptly/publisher/__init__.py b/aptly/publisher/__init__.py
index dc3dd04..c7010bf 100644
--- a/aptly/publisher/__init__.py
+++ b/aptly/publisher/__init__.py
@@ -265,7 +265,7 @@ class Publish(object):
         if not snapshot:
             return []
 
-        source_snapshots = re.findall(r"'([\w\d-]+)'", snapshot['Description'])
+        source_snapshots = re.findall(r"'([\w\d\.-]+)'", snapshot['Description'])
         if not source_snapshots and fallback_self:
             source_snapshots = [snapshot['Name']]
 
@@ -288,13 +288,14 @@ class Publish(object):
                 continue
 
             # Look if merged snapshot doesn't already exist
-            remote_snapshot = self._find_snapshot(r'^%s%s-\d+' % (self.merge_prefix, component))
+            remote_snapshot = self._find_snapshot(r'^%s%s-%s-\d+' % (self.merge_prefix, self.name.replace('./', '').replace('/', '-'), component))
             source_snapshots = self._get_source_snapshots(remote_snapshot)
 
             # Check if latest merged snapshot has same source snapshots like us
             snapshots_want = list(snapshots)
             snapshots_want.sort()
 
+            lg.debug("Comparing snapshots: snapshot_name=%s, snapshot_sources=%s, wanted_sources=%s" % (remote_snapshot['Name'], source_snapshots, snapshots_want))
             if snapshots_want == source_snapshots:
                 lg.info("Remote merge snapshot already exists: %s (%s)" % (remote_snapshot['Name'], source_snapshots))
                 self.publish_snapshots.append({
diff --git a/aptly/publisher/__main__.py b/aptly/publisher/__main__.py
index c9695a7..6685b53 100644
--- a/aptly/publisher/__main__.py
+++ b/aptly/publisher/__main__.py
@@ -44,7 +44,7 @@ def main():
 
     group_publish = parser.add_argument_group("Action 'publish'")
     group_publish.add_argument('-c', '--config', default="/etc/aptly/publisher.yaml", help="Configuration YAML file")
-    group_publish.add_argument('--distributions', '--dists', nargs='+', help="Space-separated list of distribution to work with (including prefix), default all.")
+    group_publish.add_argument('--dists', '--distributions', nargs='+', help="Space-separated list of distribution to work with (including prefix), default all.")
 
     group_promote = parser.add_argument_group("Action 'promote'")
     group_promote.add_argument('--source', help="Source publish to take snapshots from")
diff --git a/setup.py b/setup.py
index a3ae692..5dbec7c 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ long_desc = open('README.rst').read()
 
 setup(
     name="python-aptly",
-    version="0.7.8",
+    version="0.7.9",
     description="Aptly REST API client and tooling",
     long_description=long_desc,
     author="Filip Pytloun",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-aptly.git