Rev 402: Remove the bits of code that were only used when running interactively in http://bzr.arbash-meinel.com/branches/bzr/bzr-builddeb/changelog-hook

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/bzr-builddeb/changelog-hook

------------------------------------------------------------
revno: 402
revision-id: john at arbash-meinel.com-20100128113921-jlkqz0h8k0x9eijb
parent: john at arbash-meinel.com-20100128113749-wy3b7epu6wn0cwdb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: changelog-hook
timestamp: Thu 2010-01-28 05:39:21 -0600
message:
  Remove the bits of code that were only used when running interactively
  
  rather than as a merge function.
-------------- next part --------------
=== modified file 'merge_changelog.py'
--- a/merge_changelog.py	2010-01-28 11:37:49 +0000
+++ b/merge_changelog.py	2010-01-28 11:39:21 +0000
@@ -16,20 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os, sys, re, time, logging
-
-from stat import *
-from textwrap import fill
-
-def usage():
-    print '''Usage: merge_changelog <left changelog> <right changelog>
-
-merge_changelog takes two changelogs that once shared a common source, 
-merges them back together, and prints the merged result to stdout.  This
-is useful if you need to manually merge a ubuntu package with a new
-Debian release of the package.
-'''
-    sys.exit(1)
+import re
 
 ########################################################################
 # Changelog Management
@@ -260,14 +247,3 @@
         if result != 0: return result
 
     return 0
-
-
-if __name__ == '__main__':
-    if len(sys.argv) != 3:
-        usage()
-    
-    left_changelog = sys.argv[1]
-    right_changelog = sys.argv[2]
-
-    merge_changelog(left_changelog, right_changelog)
-    sys.exit(0)