Merge lp:~glen666/pastebinit/pld-patches into lp:pastebinit

Proposed by Elan Ruusamäe
Status: Rejected
Rejected by: Stéphane Graber
Proposed branch: lp:~glen666/pastebinit/pld-patches
Merge into: lp:pastebinit
Diff against target: 0 lines
To merge this branch: bzr merge lp:~glen666/pastebinit/pld-patches
Reviewer Review Type Date Requested Status
Stéphane Graber Needs Resubmitting
Review via email: mp+4132@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Elan Ruusamäe (glen666) wrote :

currently this patch includes change to allow (internal perhaps) installation of pastebin and posting to it:

$ cat datafile | pastebinit -b http://myhost.lan/pastebin/ -i -
http://myhost.lan/pastebin/?show=f2b9ef977

lp:~glen666/pastebinit/pld-patches updated
63. By Elan Ruusamäe <email address hidden>

- parse configfile contents (bug!)
- allow config items being optional

Revision history for this message
Stéphane Graber (stgraber) wrote :

Hi, recent changes to the trunk branches moved a lot of code around, could you check if your branch still applies and if not provide an updated branch ?

Thanks a lot for your work and sorry for not getting back to you sooner.

lp:~glen666/pastebinit/pld-patches updated
64. By Elan Ruusamäe

- merge from trunk

Revision history for this message
Stéphane Graber (stgraber) wrote :

I tried merging the branch but no changes appear to be in it.

review: Needs Resubmitting

Unmerged revisions

64. By Elan Ruusamäe

- merge from trunk

63. By Elan Ruusamäe <email address hidden>

- parse configfile contents (bug!)
- allow config items being optional

62. By Elan Ruusamäe <email address hidden>

- allow any pastebin install, just require /pastebin/ being it's install location

also:
- space cleanup
- regexp simplify

Preview Diff

Empty

Subscribers

People subscribed via source and target branches

to all changes: