Jump to content


Photo

merge requests for PLi's git


  • Please log in to reply
1748 replies to this topic

Re: merge requests for PLi's git #1101 arn354

  • Senior Member
  • 146 posts

+12
Neutral

Posted 4 March 2017 - 16:25

You need to run enigma2 in console - then you see.

Traceback (most recent call last):
File "/usr/lib/enigma2/python/Components/ActionMap.py", line 65, in action
return ActionMap.action(self, contexts, action)
File "/usr/lib/enigma2/python/Components/ActionMap.py", line 46, in action
res = self.actions[action]()
File "/usr/lib/enigma2/python/Screens/Wizard.py", line 376, in ok
self.finished()
File "/usr/lib/enigma2/python/Screens/Wizard.py", line 331, in finished
print "current:", self["list"].current
File "/usr/lib/enigma2/python/Components/Element.py", line 13, in wrapper
return f(self)
File "/usr/lib/enigma2/python/Components/Sources/List.py", line 53, in getCurrent
return self.master is not None and self.master.current
AttributeError: 'StringListSelection' object has no attribute 'current'


TemplatedMultiContent.py is the culprit

Re: merge requests for PLi's git #1102 Erik Slagter

  • PLi® Core member
  • 46,969 posts

+541
Excellent

Posted 5 March 2017 - 09:38

If a commit (either manual or from a PR) empties a complete file (unintentionally), I think it's clear what needs to be done? Revert and only then look further? This also mean the PR lacked TWO steps of verification, by the author and by the committer!


* Wavefrontier T90 with 28E/23E/19E/13E via SCR switches 2 x 2 x 6 user bands
I don't read PM -> if you have something to ask or to report, do it in the forum so others can benefit. I don't take freelance jobs.
Ik lees geen PM -> als je iets te vragen of te melden hebt, doe het op het forum, zodat anderen er ook wat aan hebben.


Re: merge requests for PLi's git #1103 fairbird

  • Senior Member
  • 413 posts

+20
Neutral

Posted 6 April 2017 - 19:41

Hello friends ..

Please If can add (fade-out) 

https://github.com/O...2373ccc4fad9b88

 

Thank you


Edited by fairbird, 6 April 2017 - 19:42.

DM500s
DM800

DM800se

DM920UHD


Re: merge requests for PLi's git #1104 ims

  • PLi® Core member
  • 13,764 posts

+214
Excellent

Posted 6 April 2017 - 20:40

Pls, merge this fix

 

thx


Kdo nic nedělá, nic nezkazí!

Re: merge requests for PLi's git #1105 littlesat

  • PLi® Core member
  • 57,062 posts

+698
Excellent

Posted 6 April 2017 - 21:52

Done....


And the fade out of osd is a note done patch... It works-a-round a fade out effect by playing with transparancy of thr OSD just for a x-mass tree effect.... I would say please keep it simple...

WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W


Re: merge requests for PLi's git #1106 SpaceRat

  • Senior Member
  • 1,030 posts

+65
Good

Posted 1 October 2017 - 15:18

Your gstplayer-recipe https://github.com/O...stplayer_0.1.bb has a bug:
 
do_compile() {
    cd ${S}/gstplayer/gst-1.0
    ${CC} *.c ../common/*.c -I../common/ `pkg-config --cflags --libs gstreamer-1.0 gstreamer-pbutils-1.0` -o gstplayer_gst-1.0 ${LDFLAGS}
}
without an "inherit pkgconfig" inside the recipe will invoke pkg-config with the host/build machine's /usr/include, /usr/lib etc.

The recipe fails if no gstreamer-dev packages are installed on the build machine and if it has different versions installed, it might result in a borked binary.

Simply adding
inherit pkgconfig
to the recipe will fix that.

https://github.com/o...a87362f6ca54829
1st box: Vu+ Ultimo 4k 4xDVB-S2 FBC / 2xDVB-C / 1.8 TB HDD / OpenATV 6.2
2nd box: Gigablue Quad 4k 2xDVB-S2 FBC / 2xDVB-C / 1.8 TB HDD / OpenATV 6.2
testing boxes: Vu+ Duo² + AX Quadbox HD2400 + 2x Vu+ Solo² + Octagon SF4008
Sats & Pay-TV: Astra 19.2°E + Hotbird 13°E with Redlight / SCT HD / SES Astra HD- / Sky V14 / 4th empire propaganda TV
Card-Server: Raspberry Pi + IPv6-capable oscam
Router: Linksys WRT1900ACS w/ LEDE + Fritz!Box 7390

Re: merge requests for PLi's git #1107 athoik

  • PLi® Core member
  • 8,458 posts

+327
Excellent

Posted 1 October 2017 - 15:39

Already handled on pyro branch: https://github.com/O...50449c5ec62c900
Wavefield T90: 0.8W - 1.9E - 4.8E - 13E - 16E - 19.2E - 23.5E - 26E - 33E - 39E - 42E - 45E on EMP Centauri DiseqC 16/1
Unamed: 13E Quattro - 9E Quattro on IKUSI MS-0916

Re: merge requests for PLi's git #1108 WanWizard

  • PLi® Core member
  • 70,220 posts

+1,798
Excellent

Posted 1 October 2017 - 16:14

I think it should be in develop too, Pyro is still a bit off a release. Can if be cherry picked, or does it need to be added?


Currently in use: VU+ Duo 4K (2xFBC S2), VU+ Solo 4K (1xFBC S2), uClan Usytm 4K Ultimate (S2+T2), Octagon SF8008 (S2+T2), Zgemma H9.2H (S2+T2)

Due to my bad health, I will not be very active at times and may be slow to respond. I will not read the forum or PM on a regular basis.

Many answers to your question can be found in our new and improved wiki.


Re: merge requests for PLi's git #1109 athoik

  • PLi® Core member
  • 8,458 posts

+327
Excellent

Posted 1 October 2017 - 16:28

Cherry pick should work fine, although on our build servers we don't install gstreamer-dev packages and we never had that problem.

Indeed going on pyro, the depends are more strict now.
Wavefield T90: 0.8W - 1.9E - 4.8E - 13E - 16E - 19.2E - 23.5E - 26E - 33E - 39E - 42E - 45E on EMP Centauri DiseqC 16/1
Unamed: 13E Quattro - 9E Quattro on IKUSI MS-0916

Re: merge requests for PLi's git #1110 WanWizard

  • PLi® Core member
  • 70,220 posts

+1,798
Excellent

Posted 2 October 2017 - 14:23

This is all a bit above my head. Could you backport anything that needs backporting from Pyro to develop?


Currently in use: VU+ Duo 4K (2xFBC S2), VU+ Solo 4K (1xFBC S2), uClan Usytm 4K Ultimate (S2+T2), Octagon SF8008 (S2+T2), Zgemma H9.2H (S2+T2)

Due to my bad health, I will not be very active at times and may be slow to respond. I will not read the forum or PM on a regular basis.

Many answers to your question can be found in our new and improved wiki.


Re: merge requests for PLi's git #1111 athoik

  • PLi® Core member
  • 8,458 posts

+327
Excellent

Posted 2 October 2017 - 15:13

Cherry picking from pyro branch into develop is fine?

Later merging from develop to pyro will create duplicates?
Wavefield T90: 0.8W - 1.9E - 4.8E - 13E - 16E - 19.2E - 23.5E - 26E - 33E - 39E - 42E - 45E on EMP Centauri DiseqC 16/1
Unamed: 13E Quattro - 9E Quattro on IKUSI MS-0916

Re: merge requests for PLi's git #1112 WanWizard

  • PLi® Core member
  • 70,220 posts

+1,798
Excellent

Posted 2 October 2017 - 15:56

Yes, that is the downside of cherry picking, and the reason I don't like it. But sometimes it can't be avoided.


Currently in use: VU+ Duo 4K (2xFBC S2), VU+ Solo 4K (1xFBC S2), uClan Usytm 4K Ultimate (S2+T2), Octagon SF8008 (S2+T2), Zgemma H9.2H (S2+T2)

Due to my bad health, I will not be very active at times and may be slow to respond. I will not read the forum or PM on a regular basis.

Many answers to your question can be found in our new and improved wiki.


Re: merge requests for PLi's git #1113 athoik

  • PLi® Core member
  • 8,458 posts

+327
Excellent

Posted 2 October 2017 - 16:17

What if we use rebase? like described here: https://davitenio.wo...licate-commits/
Wavefield T90: 0.8W - 1.9E - 4.8E - 13E - 16E - 19.2E - 23.5E - 26E - 33E - 39E - 42E - 45E on EMP Centauri DiseqC 16/1
Unamed: 13E Quattro - 9E Quattro on IKUSI MS-0916

Re: merge requests for PLi's git #1114 WanWizard

  • PLi® Core member
  • 70,220 posts

+1,798
Excellent

Posted 2 October 2017 - 17:03

Maybe Erik can comment, I'm not the best in advanced git wizardry. ;)


Currently in use: VU+ Duo 4K (2xFBC S2), VU+ Solo 4K (1xFBC S2), uClan Usytm 4K Ultimate (S2+T2), Octagon SF8008 (S2+T2), Zgemma H9.2H (S2+T2)

Due to my bad health, I will not be very active at times and may be slow to respond. I will not read the forum or PM on a regular basis.

Many answers to your question can be found in our new and improved wiki.


Re: merge requests for PLi's git #1115 Erik Slagter

  • PLi® Core member
  • 46,969 posts

+541
Excellent

Posted 2 October 2017 - 18:18

Rebase can only ever be done on a non-public branch. I am a great fan of rebasing branches, to clean out all sorts of mess, but in this case it's impossible.

 

The pyro branch will be cleaned out anyway, it will be taken offline at some point, cleaned up (using rebasing) and then commits that make it different from develop will be added cleanly.

 

Anyway, just say which commit to cherry pick or @athoik do it yourself.


* Wavefrontier T90 with 28E/23E/19E/13E via SCR switches 2 x 2 x 6 user bands
I don't read PM -> if you have something to ask or to report, do it in the forum so others can benefit. I don't take freelance jobs.
Ik lees geen PM -> als je iets te vragen of te melden hebt, doe het op het forum, zodat anderen er ook wat aan hebben.


Re: merge requests for PLi's git #1116 athoik

  • PLi® Core member
  • 8,458 posts

+327
Excellent

Posted 2 October 2017 - 18:21

Most of my commits apply on develop.

So will cherry-pick them to develop.
Wavefield T90: 0.8W - 1.9E - 4.8E - 13E - 16E - 19.2E - 23.5E - 26E - 33E - 39E - 42E - 45E on EMP Centauri DiseqC 16/1
Unamed: 13E Quattro - 9E Quattro on IKUSI MS-0916

Re: merge requests for PLi's git #1117 athoik

  • PLi® Core member
  • 8,458 posts

+327
Excellent

Posted 6 October 2017 - 17:25

Most of my commits apply on develop.

So will cherry-pick them to develop.


Commits without conflicts cherry-picked to develop.

Two two left out due to conflicts (will handle them later).

0a8e4526883e952719ac3df3f03236cbb22226d8
f4fe30d1e9a9dce6fa49be24c8b9988d708dafe3

Also few more seem "pyro" only specific so I didn't cherry-pick them.

Edited by athoik, 6 October 2017 - 17:25.

Wavefield T90: 0.8W - 1.9E - 4.8E - 13E - 16E - 19.2E - 23.5E - 26E - 33E - 39E - 42E - 45E on EMP Centauri DiseqC 16/1
Unamed: 13E Quattro - 9E Quattro on IKUSI MS-0916

Re: merge requests for PLi's git #1118 Persian Prince

  • Senior Member
  • 1,982 posts

+247
Excellent

Posted 4 December 2017 - 06:50

https://github.com/O...io-grab/pull/10


Open Vision sources: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1119 Persian Prince

  • Senior Member
  • 1,982 posts

+247
Excellent

Posted 5 December 2017 - 09:03

Is vuzero4k build ok or you didn't start the build yet?


Open Vision sources: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1120 Erik Slagter

  • PLi® Core member
  • 46,969 posts

+541
Excellent

Posted 5 December 2017 - 10:48

athoik is taking care of it.


* Wavefrontier T90 with 28E/23E/19E/13E via SCR switches 2 x 2 x 6 user bands
I don't read PM -> if you have something to ask or to report, do it in the forum so others can benefit. I don't take freelance jobs.
Ik lees geen PM -> als je iets te vragen of te melden hebt, doe het op het forum, zodat anderen er ook wat aan hebben.



22 user(s) are reading this topic

0 members, 22 guests, 0 anonymous users