From 673204ceb909f1fd89c386668936131895ea2559 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Mon, 13 Dec 2010 15:06:27 +0300
Subject: [PATCH] Revert "Add creating mask,unmask list."

This reverts commit f02cb81d65b3e0e12ac0aa13d97d05290b517196.
---
 i18n/cl_builder_ru.mo | Bin 14006 -> 13842 bytes
 pym/cl_builder.py     |  38 --------------------------------------
 2 files changed, 38 deletions(-)

diff --git a/i18n/cl_builder_ru.mo b/i18n/cl_builder_ru.mo
index 23573fa3a15638c3f75f8680fe8ccfb13c2b7096..9d6b44bfe785547d248fd6ab40b6575dd0472fb1 100644
GIT binary patch
delta 2609
zcmYk+ZA_JA9LMoL9tAmoAaLTbIK)#T2pkmXWIQH@L@1)D0ZM{sNCqfHW1h8Xu4S8p
zxv)lSYQB-y3mi7LoXxHEqO~?%Taj)ImRl<q<iZ!d==(e8ZtL3l-=F*GTo3>2y6&0&
zv7>?e@hi_8Wtd1OzH^yP;%Ed1%Ab*Dskn$wW3<~W8;kHsY(*aqqTc(=xxR(5T>pi&
z=!!Bcz<Nx^A@rC9>?|i<Zd`P{jX7K|pk8!Gn`K}YuEjd^;x42D8^%&Ri|g=~<8RLM
z#F)_k@=^6{#&~Q;5AEAAPD;3O8nf`a^TI4@L=RCTja*}vf_bQhYcLbrP|rtD8T=5{
zk!z?--ABFWA{~03<5(+c-}ZCj#ZgobCmp{+b>JRq<d0DeyW`BBLNAget3v&+5i76{
z)zD>Bhrh-&oJD1H8C6dll?D<x$>l^3{HW`ls0w>gBRGRk;1p`4w^1paLk4G$Q2%#v
zQzK1Bt(8hthq^EkKf(h10@a~k;>kbRwa46`Qx;C^T6am9j~Tcgx8Wun#&Vp(B3wW<
zm`LqPc^N)~2T&b*5Bb>yhf@3;3vmuLpjZ$2rw+>{A9~S`YN#2N!qZrc7f~s{gBt0Q
zV-&Th!EDUMCRE0bqu#%OUi=c1@F(1ai?{>x0^Id;GJ;C^HB`^<qB=H@UR*}nv}9T*
z+qMBU71gLzcA}oYjc<jSokOjiNDft)jWyVfe!PM&VqlIFr6iwPcH$n?E||i1@CWR}
z7SiFvn^=O2SdCfq;yLWbdi)f%-yb;F`J_QpGk|LFV^pRVaJ%+@6vI}}+HoU(g6hB>
zqz+rgt?2QF=DGuw;s7?`W!#KQsD_F%L#f@18tGMh7Jo%`+{?<;{TAG<{r`b;V*$7D
zAcNLhu?HLR25QxY)2bRMb?iWO<P3)mIE4*3iyA-<Uoj1+0rmfrs7zf&ZOaF^j`l5#
zd?<D6k$X0XTHO<<o_>q`%#|0Kf_zlP9k>t2P#yULm5F#(q@FjUMtlmD$r<DoyNk@K
z{euB*vt)*)hU!o+oJ3W81xbp9@zP$*##i(lS&#NJ@`^2?wr@InRT(S9mv96}@EdH$
zYSOR;C$SXg3&?*xCrPZp7qAog6xb!yh-dIH-a}PTPo8PZE}=U5J@Ux@#x~3*Z5qfZ
zzKhrKd8}j)*XTYfvp2C09~P5;HS8l#wfH6~Wj8o9;qO?6ewO|@9KiFqg6=C56R6Zb
zLZvu`yweve$5A|l4BqBZBaUVB@4`CNR9y&gqDAo|hN04_)vBUD{#Tf);2+sFHsIV;
zhkJ=sVzqN`zoSO0(m}X_XQAz<Q+50pp+y>~=Acw-Uic^lM_++`ghq6bP^z{QU4+W2
z5VpdRYzDs#YcZDSCzQ2qgr+Bx(6mMoDu+VYkoNx|7g|i+#8IN0I8G>C2M8@BH_=R}
zXhCW%v=EwWmEDA<p@C>55(!O%${Qi<HOE#*(WXz{>&^`izD%qkv?hj$3_?Y#zlVs^
z1*MbV3mYuVTyRl2m$q?yV0A)ZC6^I|m#8BCU$ms7i6ew2Kb_b?Xi2N=A?k?)f({0k
zFk2?L^db25(CSGeA_=Y3aAGS_Nl;SlRgT)kIm8Jfh6tAF9QXUK=%IlVT|<YxNBX;Z
td!`p+%A!`46b>FN8Ba^;cNZ7>eBP3Bzpr9?EM;HBcx<L;x*@aQ^Dm->^WOjf

delta 2726
zcmY+^drZ}39LMp8ODQ*zJ95b%kcolm;ihs?4xpfdfKm_?g@nXa1xzaEPd0^?)lAYg
z*2;3`hRfP$W_E!VTeeo=YBn$VN6WF=+}hfbEL-o-IX_%IJKx{y`Q4t&_j!KjaOasW
z`&zjF5ku)G5{RpQ#vI4j=5U~-1{xEGOE4Kr@Lp`iM0^1=a1{02kIwlFhH{=3WK0p}
zVLI-`SUiPM#@J?(ip7P?j(_1I&J%*Y4;JA<&KoccpG6B_L>e%sF%u_o3C=hshj{Oo
zqu$$!YNrpw@fDA@F(;|0p>r6CQ|Q9$n1V6$yf5UTX1ED8^EO<7L#X%P#3cN{xqk_j
z(VM7&MUoC>ZZ+z;W=x=eb3he*%W)hn&aa|IeA_W`zIOlxs2SCvI&Q~%a37L9^9Jg@
zQ@9epLbdPDOB!$z#$z7ZT8mmLYG?;W;2`Syh;u%MYVZrx45l#}gUO>Zk%CI8n*)<I
zHK_NSQ8V3x+B>hK2J{&!)3?G||8y#$^r{i%BUv|f$e_(O)IQve_oIzzIEvYL5m#U^
ztu4b6REK@2lpn=ZoInli7vyJVIAmf-6!~9D#m)3JqwPqWW)St@2xjBEs1#nu<><@9
zN_i$~rkfo*P#x~a`|ur9#=b{A|0h})8^gZBRW?U;P>t0%gt>SLmGVeh*T}O_11m-g
zYmu>-eq=SwOQ@wdhRWop&i%{S=VQ!osLk8LVGZs>H`)_aa;f<8Rv8wcGBSu;@O{)*
zFqi2MU^;f-Y0SVldUat17NU)LIDzZ%Z`Ai+%=C3Wh+3Mjk^XFRlZsMR$aJf)6*aQ6
zn1#1c16XExXSfARIp2v%_#tX@T|uS#AIB7KR&ZX1`FIr7@pq_9-^N_}H<i4-iVM%9
zW-^J&$RGF+y69c!&*5799BVLu-Zo+*Y7>v5I{3lShkr4uCJi6JDqN2?YC>OP7X6zW
zRMbE+X;A7aQQzr7RD&mQ9e#^EYN8i=cY8i+V4cV<a}u>A-=H$*!%nQn9MnKwMrGm*
z>i+L&YsRVc!ZMk9<XzK`EW0^|`s_YNbu{hVPv)W;-hd>@oWO_iJT_o5-zfXn>_uKN
zM^T^i1a8C&SdNM5<o{_Z?M(j>{2AAxn;od{a|ku_kFW%N$s_+ArW7^fdVCTGQ1AbW
zjKP%hXP}AnAg`Jcti|)FiCBEYgV?Z~{1;I9i3@JsARRnowqh|JMs<7<i!h%2QZ<cO
zfrl^$ui+t#V$?_QZB!=m$+J@bDk{UDAY(LFa1RFBeEej?454N`h7aO2YOM-rU3=mg
z^ucY!Y|-W{B$|mvVl}aXc!F3%s60m8O(f`qqDiUD^`ianO_8i5`UtJ*Yzd~Kft3<b
z&PA=gmPw_XU@|6<&>CyjzC;|MrHLfiXPyn-j@5)Rspas~qpo3hK*VrWfWNJTh7b#h
z9fXRK>re2pdWyE0wvftBB9yp`=ps~DhdbqQYMn%rbEO|Gr~W9`5YfbXf<>}DTZX!)
z=mVTB5l$t*Q47SsmS-zzHCGYZb|u79#Ad>?i%_ME2=dgthuxsvz^3#3$7%<rX(?K$
zq!25KUZRfBzE;^zZ1U8M*@fEw^N0;ZIkAp#6Z+uh5MczH$W!7S+Z;vgf9kE&7g-#t
zoQpBoLv#?@e&Iy^*o}aLegR!gy&YC(TW{ZRcSuZRaZgKAUt4#pwX6Hijj{b9IYB-d
z!{f1Cff-9(nU*UnH`_Iqv!H%X*oA?q@u{;M&rQ8&>5bvN*5cuP*8GV7-SM_IcHG(?
F^)LLk9E1P>

diff --git a/pym/cl_builder.py b/pym/cl_builder.py
index b777c53..f0bf9c5 100644
--- a/pym/cl_builder.py
+++ b/pym/cl_builder.py
@@ -434,12 +434,6 @@ class cl_builder(color_print):
         self.printMessageForTest(_("Creating installed package list"))
         self.printByResult(self.createPackageList(sourceDirectory,
                            isoFile[:-4]+".list"))
-        self.printMessageForTest(_("Creating mask list"))
-        self.printByResult(self.createMaskList(sourceDirectory,
-                           isoFile[:-4]+".mask"))
-        self.printMessageForTest(_("Creating unmask list"))
-        self.printByResult(self.createUnmaskList(sourceDirectory,
-                           isoFile[:-4]+".unmask"))
         self.printMessageForTest(_("Creating DIGESTS file"))
         self.printByResult(self.createDigest(isoFile,isoFile+".DIGESTS"))
 
@@ -656,38 +650,6 @@ class cl_builder(color_print):
             return False
         return True
 
-    def createMaskList(self,chrootdir,filename):
-        """Create package mask list by chrootdir"""
-        pkgdir = path.join(chrootdir,'var/db/pkg')
-        reVerSplit = re.compile(r"^(.*?)-(([^-]+?)(?:-(r\d+))?)$",re.S)
-        if not path.exists(chrootdir):
-            return False
-        try:
-            packageList = sorted(reduce(lambda x,y:x+map(lambda x:path.join(y,x),
-                os.listdir(path.join(pkgdir,y))), os.listdir(pkgdir),[]))
-            open(filename,'w').writelines(
-                map(lambda x:"%s\n"%x,
-                map(lambda x:x.groups()[0],
-                filter(lambda x:x,
-                map(reVerSplit.search,
-                packageList)))))
-        except (IOError,OSError),e:
-            return False
-        return True
-
-    def createUnmaskList(self,chrootdir,filename):
-        """Create package unmask list by chrootdir"""
-        pkgdir = path.join(chrootdir,'var/db/pkg')
-        if not path.exists(chrootdir):
-            return False
-        try:
-            packageList = sorted(reduce(lambda x,y:x+map(lambda x:path.join(y,x),
-                os.listdir(path.join(pkgdir,y))), os.listdir(pkgdir),[]))
-            open(filename,'w').writelines(map(lambda x:"=%s\n"%x,packageList))
-        except (IOError,OSError),e:
-            return False
-        return True
-
     def createDigest(self,filename,digestfile):
         """Create file with digest"""
         template = """# %(alg)s HASH\n%(digest)s  %(filename)s\n"""