|
Line
Link Here
|
| 0 |
-- src/output/formatstring-print.cc |
0 |
++ src/output/formatstring-print.cc |
|
Lines 491-496
Link Here
|
| 491 |
PrintFormat::get_pkg_property(const Package *package, const string &name) const throw(ExBasic) |
491 |
PrintFormat::get_pkg_property(const Package *package, const string &name) const throw(ExBasic) |
| 492 |
{ |
492 |
{ |
| 493 |
Scanner::PropType t = Scanner::PKG; |
493 |
Scanner::PropType t = Scanner::PKG; |
|
|
494 |
cerr << "Name: " << name << endl; |
| 494 |
Scanner::Prop prop = scanner.get_prop(name, &t); |
495 |
Scanner::Prop prop = scanner.get_prop(name, &t); |
| 495 |
string after_colon; |
496 |
string after_colon; |
| 496 |
if(prop == Scanner::PROP_NONE) { |
497 |
if(prop == Scanner::PROP_NONE) { |
|
Lines 501-507
Link Here
|
| 501 |
throw ExBasic(_("Unknown property %r")) % name; |
502 |
throw ExBasic(_("Unknown property %r")) % name; |
| 502 |
} |
503 |
} |
| 503 |
after_colon = name.substr(col + 1); |
504 |
after_colon = name.substr(col + 1); |
|
|
505 |
cerr << "\t*:" << after_colon; |
| 504 |
} |
506 |
} |
|
|
507 |
cerr << "\t-> (" << prop << ", " << t << ")" << endl; |
| 505 |
if((t == Scanner::VER) && !version_variables) { |
508 |
if((t == Scanner::VER) && !version_variables) { |
| 506 |
throw ExBasic(_("Property %r used outside version context")) % name; |
509 |
throw ExBasic(_("Property %r used outside version context")) % name; |
| 507 |
} |
510 |
} |
|
Lines 985-995
Link Here
|
| 985 |
default: |
988 |
default: |
| 986 |
//case Scanner::VER_WAS.... |
989 |
//case Scanner::VER_WAS.... |
| 987 |
if(!(version_variables->isinst)) { |
990 |
if(!(version_variables->isinst)) { |
|
|
991 |
cerr << "Setting version" << endl; |
| 988 |
const Version *version = version_variables->version(); |
992 |
const Version *version = version_variables->version(); |
| 989 |
MaskFlags mymask(version->maskflags); |
993 |
MaskFlags mymask(version->maskflags); |
| 990 |
KeywordsFlags mykey(version->keyflags); |
994 |
KeywordsFlags mykey(version->keyflags); |
| 991 |
if(!a) |
995 |
if(!a) |
|
|
996 |
{ cerr << "Calc stability" << endl; |
| 992 |
stability->calc_version_flags(false, mymask, mykey, version, package); |
997 |
stability->calc_version_flags(false, mymask, mykey, version, package); |
|
|
998 |
} cerr << "Calc result" << endl; |
| 993 |
switch(prop) { |
999 |
switch(prop) { |
| 994 |
case Scanner::VER_ISHARDMASKED: |
1000 |
case Scanner::VER_ISHARDMASKED: |
| 995 |
case Scanner::VER_WASHARDMASKED: |
1001 |
case Scanner::VER_WASHARDMASKED: |
