Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the copying of changelog lines less brittle #125

Merged
merged 1 commit into from
May 30, 2020
Merged

Make the copying of changelog lines less brittle #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion apt_offline_core/AptOfflineCoreLib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,8 +1135,17 @@ def buildChangelog(self, pkgPath, installedVersion):
#Seek to beginning
chlogFile.seek(0)

if 'Source' in pkgHandle:
srcname = pkgHandle['Source']
else:
srcname = pkgHandle.pkgname
if ' ' in srcname:
srcname = srcname.split(' ', 1)[0]
installedVersion_changelog_line = "%s (%s) " % (srcname, installedVersion)

# FIXME: replace this with parsing the changelog using the Python debian module
for eachLine in chlogFile.readlines():
if installedVersion in eachLine:
if eachLine.startswith(installedVersion_changelog_line):
break
else:
pkgLogFile.writelines(eachLine)
Expand Down