diff --git a/.gitignore b/.gitignore index cf21867..a43d5ba 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,8 @@ __pycache__ /python/irclogtools.egg-info/ /tmp/ /debian/irclogtools +/debian/debhelper-build-stamp +/debian/files +/debian/irclogtools.debhelper.log +/debian/irclogtools.substvars /ilogarchive diff --git a/build.sh b/build.sh index 8d7a2de..320c110 100755 --- a/build.sh +++ b/build.sh @@ -1,3 +1,6 @@ #!/bin/sh dpkg-buildpackage -us -uc -b + +mv ../irclogtools_1.0.0-1_a* ./ +rm *.changes diff --git a/src/containers.go b/src/containers.go index 4ab781e..8129988 100644 --- a/src/containers.go +++ b/src/containers.go @@ -247,14 +247,14 @@ func (self *CombinedLogfile) AddPortion(newportion LogPortion) { if self.Channel == "" { self.Channel = newportion.meta.Channel // TODO set attr on all children } else if newportion.meta.Channel != "" && self.Channel != newportion.meta.Channel { - panic(fmt.Sprintf("Attempted to add portion with channel '%s' to archive with channel '%s'", - newportion.meta.Channel, self.Channel)) + panic(fmt.Sprintf("Attempted to add portion with channel '%s' to archive with channel '%s'. Log: %s", + newportion.meta.Channel, self.Channel, newportion.meta.Name)) } if self.Network == "" { self.Network = newportion.meta.Network // TODO set attr on all children } else if newportion.meta.Network != "" && self.Network != newportion.meta.Network { - panic(fmt.Sprintf("Attempted to add portion with network '%s' to archive with network '%s'", - newportion.meta.Network, self.Network)) + panic(fmt.Sprintf("Attempted to add portion with network '%s' to archive with network '%s'. Log: %s", + newportion.meta.Network, self.Network, newportion.meta.Name)) } // Remove any portions with identical date for i, portion := range self.portions {