Change order of pastebin.d location to end with CWD. Sort pastebin li…

…sting.
i-nex · Feb 13, 2012 · 7b57ad4 · 7b57ad4
1 parent 171766a
commit 7b57ad4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pastebinit b/pastebinit
@@ -60,8 +60,8 @@ try:
         # Files found later override files found earlier.
         pastebind = {}
         for confdir in ['/usr/share/pastebin.d','/etc/pastebin.d','/usr/local/etc/pastebin.d',
-                        os.path.join(os.path.dirname(__file__), 'pastebin.d'),
-                        os.path.expanduser('~/.pastebin.d')]:
+                        os.path.expanduser('~/.pastebin.d'),
+                        os.path.join(os.path.dirname(__file__), 'pastebin.d')]:
             try:
                 confdirlist = os.listdir(confdir)
             except OSError:
@@ -264,7 +264,7 @@ try:
             jabberid = opt[1]
         elif opt[0] == "-l":
             print _("Supported pastebins:")
-            for pastebin in pastebind:
+            for pastebin in sorted(pastebind):
                 print "- %s" % pastebin
             sys.exit(0)
         elif opt[0] == "-t":