aboutsummaryrefslogtreecommitdiffhomepage
path: root/git-import-dsc
diff options
context:
space:
mode:
authorMatthijs Kooijman <matthijs@stdin.nl>2010-08-19 12:33:02 +0200
committerGuido Günther <agx@sigxcpu.org>2010-09-17 20:07:16 +0200
commitee0e9ffe0a69d1ae1080f8087725015ae0ff8bc4 (patch)
treecaf48559cc9cc07b7d201a381e39ae9adc3ff48f /git-import-dsc
parent083834b407e2e76e1386f9004e495a88f2906cf4 (diff)
Let git-import-orig find the changelog when not on the debian-branch.
When no changelog file is available in the checkout, look for the changelog in the repository. This allows for using git-import-orig when the upstream branch is checked out, for example.
Diffstat (limited to 'git-import-dsc')
-rwxr-xr-xgit-import-dsc2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-import-dsc b/git-import-dsc
index f51dc1e1..d9de908d 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -98,7 +98,7 @@ def apply_debian_patch(repo, unpack_dir, src, options, parents):
os.chmod('debian/rules', 0755)
os.chdir(repo.path)
- dch = parse_changelog(os.path.join(unpack_dir, 'debian/changelog'))
+ dch = parse_changelog(filename=os.path.join(unpack_dir, 'debian/changelog'))
date= rfc822_date_to_git(dch['Date'])
author, email = parseaddr(dch['Maintainer'])
if not (author and email):