fc5 test2 patch rejections

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I am trying to test kadischi against fc5 test2 and i get a patch rejection (not too unexpected) I wonder if I should try and do it by hand?

[root@testbox kadischi]# patch -b /usr/sbin/anaconda /usr/local/share/kadischi/patches/anaconda.patch
patching file /usr/sbin/anaconda
Hunk #1 FAILED at 400.
Hunk #2 succeeded at 510 with fuzz 2 (offset 16 lines).
Hunk #3 succeeded at 1154 (offset 22 lines).
1 out of 3 hunks FAILED -- saving rejects to file /usr/sbin/anaconda.rej

[root@testbox kadischi]# cat /usr/sbin/anaconda.rej
***************
*** 400,406 ****

  try:
      (args, extra) = isys.getopt(theargs, 'CGTRxtdr:fm:',
-           [ 'graphical', 'text', 'test', 'debug', 'nofallback',
              'method=', 'rootpath=', 'pcic=', "overhead=",
            'testpath=', 'mountfs', 'traceonly', 'kickstart=',
              'lang=', 'keymap=', 'kbdtype=', 'module=', 'class=',
--- 400,406 ----

  try:
      (args, extra) = isys.getopt(theargs, 'CGTRxtdr:fm:',
+           [ 'graphical', 'text', 'test', 'debug', 'nofallback', 'livecd',
              'method=', 'rootpath=', 'pcic=', "overhead=",
            'testpath=', 'mountfs', 'traceonly', 'kickstart=',
              'lang=', 'keymap=', 'kbdtype=', 'module=', 'class=',

[root@testbox kadischi]# patch -b /usr/lib/anaconda/flags.py /usr/local/share/kadischi/patches/flags.py.patch
patching file /usr/lib/anaconda/flags.py
Hunk #1 succeeded at 41 with fuzz 2 (offset 1 line).

TIA,
SW


[Index of Archives]     [Current Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]     [Fedora Docs]

  Powered by Linux