From 81dab4be2a8941767b524af79ca22991c0dce109 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Tue, 14 Oct 2014 19:18:20 +0200 Subject: pq: Don't fail commit if the series file is empty on the source branch --- gbp/scripts/pq.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py index d9f49d4f..e78f92cc 100755 --- a/gbp/scripts/pq.py +++ b/gbp/scripts/pq.py @@ -116,8 +116,13 @@ def commit_patches(repo, branch, patches, options): return ([], []) vfs = gbp.git.vfs.GitVfs(repo, branch) - oldseries = vfs.open('debian/patches/series') - oldpatches = [ p.strip() for p in oldseries.readlines() ] + try: + oldseries = vfs.open('debian/patches/series') + oldpatches = [ p.strip() for p in oldseries.readlines() ] + oldseries.close() + except IOError: + # No series file yet + oldpatches = [] newpatches = [ p[len(PATCH_DIR):] for p in patches ] # FIXME: handle case were only the contents of the patches changed -- cgit v1.2.3