Hi Erich;

Am Sonntag, 24. Juli 2011, 23:03:23 schrieb Erich Titl:
> HI KP
> 
> on 24.07.2011 01:39, KP Kirchdoerfer wrote:
> > Hi all;
> > 
> > I think we've made enough steps forward to 4.1 to build a first beta, but
> > I'm not shure if we do have showstoppers, which can be solved or has to
> > be moved to a later version.
> > 
> > David, do we need to wait for your work on isc-dhcp? I guess it can be
> > done later...
> > 
> > Andrew, I saw that you committed linker options to MasterInclude.mk. Of
> > course reviewing the Makefiles to easy buildtool setups. But I think it
> > will not break our current setups - am I wrong?
> > 
> > Erich, webconf and haserl in its current state is broken. Do you intend
> > to work on these issues soon, or shall we move the update of haserl and
> > webconf to a later release?
> 
> Could you be more specific please? I guess the current version is in
> master, but as this changes on a whim and gives me grief I kept all my
> work on my local experimental branch.

Updated webconf.lrp and get an error

haserl CGI Error
Unknown operation near line 85 of lrcfg.cgi
 
at a lot of places (e.g. every time I call a config file in "expert mode").
The same with "Backup Settings", "DSL Settings" and "Dropbear.ssh".


> My experimental branch will not be compatible with the version you'd
> like to see for Bering, as I followed up on my ideas of package contents
> to see if they are practical. There I will also introduce pwcrypt into
> the webconf package as it does not make sense to leave it in its own. It
> gets distributed with webconf anyway. All these changes of course affect
> the entire development tree, as they are reflected in source.conf.
> 
> Again, something has changed in the repository and I have no clue how to
> handle it. I don't want to spend all my time to limp behind a changing
> repository. Could  you people please be so kind and warn others about
> the effects your modifications may have on the repository?

There has been no other changes for a month than new packages and package 
updates/fixes - but none on the repository or any other part of the 
infrastructure.

> To port my modifications to the master branch requires me to redo all
> the small changes. I would if *@#!ยง GIT would not get in my way all the
> time.
> 
> mega@luna:~/leaf/devel/leaf> git branch
> * experimental
>   master
> mega@luna:~/leaf/devel/leaf> git checkout master
> error: You have local changes to 'repo/webconf/buildtool.cfg'; cannot
> switch branches.


Maybe you have not committed the changes to your local branch? In that case 
after switching to master, all your changes would  have been lost.

kp
------------------------------------------------------------------------------
Storage Efficiency Calculator
This modeling tool is based on patent-pending intellectual property that
has been used successfully in hundreds of IBM storage optimization engage-
ments, worldwide.  Store less, Store more with what you own, Move data to 
the right place. Try It Now! http://www.accelacomm.com/jaw/sfnl/114/51427378/

_______________________________________________
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Reply via email to