Skip to content

Commit

Permalink
Closing LP #219185
Browse files Browse the repository at this point in the history
  • Loading branch information
dpaleino committed Apr 18, 2008
1 parent 3d5cb7b commit e8360e6
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
3 changes: 2 additions & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
pastebinit (0.9-0ubuntu2) hardy; urgency=low
pastebinit (0.9-0ubuntu2) UNRELEASED; urgency=low

* LP #193352 - http://yourpaste.net now supported
* LP #157082 - fixing wrong manpage
* LP #219185 - fixing typo "catched" > "caught"
* debian/control: using Homepage field, not pseudo-one.
* pastebinit: better handling of command-line passed pastebins

Expand Down
1 change: 0 additions & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ Description: command-line pastebin client
- http://pastebin.ca
- http://rafb.net/paste
- http://pastebin.archlinux.org
.
14 changes: 7 additions & 7 deletions pastebinit
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ try:
f.close()
gotconfigxml = 1
except KeyboardInterrupt:
sys.exit(_("KeyboardInterrupt catched."))
sys.exit(_("KeyboardInterrupt caught."))
except:
gotconfigxml = 0

Expand All @@ -149,7 +149,7 @@ try:
format = getFirstNodeText(configxml, "format")
jabberid = getFirstNodeText(configxml, "jabberid")
except KeyboardInterrupt:
sys.exit(_("KeyboardInterrupt catched."))
sys.exit(_("KeyboardInterrupt caught."))
except:
print _("Error parsing configuration file!")
print _("Please ensure that your configuration file looks similar to the following:")
Expand All @@ -174,7 +174,7 @@ try:
try:
optlist, list = getopt.getopt(sys.argv[1:], 'i:f:b:a:r:j:t:m:u:p:')
except KeyboardInterrupt:
sys.exit(_("KeyboardInterrupt catched."))
sys.exit(_("KeyboardInterrupt caught."))
except getopt.GetoptError:
print _("Invalid arguments!\n")
Usage()
Expand Down Expand Up @@ -213,14 +213,14 @@ try:
sys.exit(1)
elif filename == "-" and content == "":
content = sys.stdin.read()
sys.exit(_("KeyboardInterrupt catched."))
sys.exit(_("KeyboardInterrupt caught."))
elif content == "":
try:
f = open(filename)
content = f.read()
f.close()
except KeyboardInterrupt:
sys.exit(_("KeyboardInterrupt catched."))
sys.exit(_("KeyboardInterrupt caught."))
except:
sys.exit(_("Unable to read from: %s") % filename)

Expand Down Expand Up @@ -249,9 +249,9 @@ try:
else:
print page.url #Get the final page and show the ur
except KeyboardInterrupt:
sys.exit(_("KeyboardInterrupt catched."))
sys.exit(_("KeyboardInterrupt caught."))
except:
sys.exit(_("Unable to read or parse the result page, it could be a server timeout or a change server side, try with another pastebin."))

except KeyboardInterrupt:
sys.exit(_("KeyboardInterrupt catched."))
sys.exit(_("KeyboardInterrupt caught."))
2 changes: 1 addition & 1 deletion po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ msgstr "\t-u <utilisateur> -p <mot de passe>"

#: ../pastebinit:137 ../pastebinit:150 ../pastebinit:175 ../pastebinit:211
#: ../pastebinit:218 ../pastebinit:236 ../pastebinit:241
msgid "KeyboardInterrupt catched."
msgid "KeyboardInterrupt caught."
msgstr "Interruption clavier."

#: ../pastebinit:152
Expand Down
2 changes: 1 addition & 1 deletion po/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ msgstr "\t-u <usename> -p <password>"

#: ../pastebinit:137 ../pastebinit:150 ../pastebinit:175 ../pastebinit:211
#: ../pastebinit:218 ../pastebinit:236 ../pastebinit:241
msgid "KeyboardInterrupt catched."
msgid "KeyboardInterrupt caught."
msgstr "KeyboardInterrupt catturato."

#: ../pastebinit:152
Expand Down

0 comments on commit e8360e6

Please sign in to comment.